logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

touch-dereference.patch (3335B)

    

  1. SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
  2. SPDX-FileCopyrightText: 2009 Eric Blake <ebb9@byu.net>
  4. SPDX-License-Identifier: GPL-2.0-or-later
  6. touch: add -h to change symlink timestamps, where supported
  8. diff -r -U3 coreutils-5.0.orig/src/touch.c coreutils-5.0/src/touch.c
  9. --- coreutils-5.0/src/touch.c	2002-12-20 20:09:22.000000000 +0000
  10. +++ coreutils-5.0/src/touch.c	2022-05-16 20:31:37.801988595 +0100
  11. @@ -77,6 +77,9 @@
  12.  /* (-r) If nonzero, use times from a reference file. */
  13.  static int use_ref;
  14.  
  15. +/* (-h) If true, change the times of an existing symlink, if possible.  */
  16. +static int no_dereference;
  17. +
  18.  /* (-t) If nonzero, date supplied on command line in POSIX format. */
  19.  static int posix_date;
  20.  
  21. @@ -110,6 +113,7 @@
  22.    {"date", required_argument, 0, 'd'},
  23.    {"file", required_argument, 0, 'r'}, /* FIXME: phase out --file */
  24.    {"reference", required_argument, 0, 'r'},
  25. +  {"no-dereference", no_argument, NULL, 'h'},
  26.    {GETOPT_HELP_OPTION_DECL},
  27.    {GETOPT_VERSION_OPTION_DECL},
  28.    {0, 0, 0, 0}
  29. @@ -138,7 +142,7 @@
  30.    int fd = -1;
  31.    int open_errno = 0;
  32.  
  33. -  if (! no_create)
  34. +  if (! (no_create || no_dereference))
  35.      {
  36.        /* Try to open FILE, creating it if necessary.  */
  37.        fd = open (file, O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY,
  38. @@ -158,7 +162,7 @@
  39.  	 the other one.  If we have the file descriptor already, use fstat.
  40.  	 Otherwise, either we're in no-create mode (and hence didn't call open)
  41.  	 or FILE is inaccessible or a directory, so we have to use stat.  */
  42. -      if (fd != -1 ? fstat (fd, &sbuf) : stat (file, &sbuf))
  43. +      if (fd != -1 ? fstat (fd, &sbuf) : (no_dereference ? lstat (file, &sbuf) : stat (file, &sbuf)))
  44.  	{
  45.  	  if (open_errno)
  46.  	    error (0, open_errno, _("creating %s"), quote (file));
  47. @@ -223,7 +227,7 @@
  48.  	}
  49.        else
  50.  	{
  51. -	  if (no_create && errno == ENOENT)
  52. +	  if ((no_create || no_dereference) && errno == ENOENT)
  53.  	    return 0;
  54.  	  error (0, errno, _("setting times of %s"), quote (file));
  55.  	}
  56. @@ -254,6 +258,9 @@
  57.    -c, --no-create        do not create any files\n\
  58.    -d, --date=STRING      parse STRING and use it instead of current time\n\
  59.    -f                     (ignored)\n\
  60. +  -h, --no-dereference   affect each symbolic link instead of any referenced\n\
  61. +                         file (useful only on systems that can change the\n\
  62. +                         timestamps of a symlink)\n\
  63.    -m                     change only the modification time\n\
  64.  "), stdout);
  65.        fputs (_("\
  66. @@ -289,7 +296,7 @@
  67.  
  68.    change_times = no_create = use_ref = posix_date = flexible_date = 0;
  69.  
  70. -  while ((c = getopt_long (argc, argv, "acd:fmr:t:", longopts, NULL)) != -1)
  71. +  while ((c = getopt_long (argc, argv, "acd:fhmr:t:", longopts, NULL)) != -1)
  72.      {
  73.        switch (c)
  74.  	{
  75. @@ -315,6 +322,10 @@
  76.  	case 'f':
  77.  	  break;
  78.  
  79. +	case 'h':
  80. +	  no_dereference = true;
  81. +	  break;
  82. +
  83.  	case 'm':
  84.  	  change_times |= CH_MTIME;
  85.  	  break;
  86. @@ -358,7 +369,10 @@
  87.  
  88.    if (use_ref)
  89.      {
  90. -      if (stat (ref_file, &ref_stats))
  91. +      /* Don't use (no_dereference ? lstat : stat) (args), since stat
  92. +         might be an object-like macro.  */
  93. +      if (no_dereference ? lstat (ref_file, &ref_stats)
  94. +          : stat (ref_file, &ref_stats))
  95.  	error (EXIT_FAILURE, errno,
  96.  	       _("failed to get attributes of %s"), quote (ref_file));
  97.        date_set++;