tar: switch to gnulib fdutimensat module

[chaz/tar] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 40635bedfa01ced9640fc7dfa258660c57532c79..ca2921b0e0e6ad597f8967c41a40df3efcf92140 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -24,14 +24,6 @@
 #include <save-cwd.h>
 #include <xgetcwd.h>
 #include <unlinkdir.h>
-#include <utimens.h>
-
-#if HAVE_STROPTS_H
-# include <stropts.h>
-#endif
-#if HAVE_SYS_FILIO_H
-# include <sys/filio.h>
-#endif
 
 #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
 # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
@@ -50,6 +42,9 @@ assign_string (char **string, const char *value)
   *string = value ? xstrdup (value) : 0;
 }
 
+#if 0
+/* This function is currently unused; perhaps it should be removed?  */
+
 /* Allocate a copy of the string quoted as in C, and returns that.  If
    the string does not have to be quoted, it returns a null pointer.
    The allocated copy should normally be freed with free() after the
@@ -62,7 +57,7 @@ assign_string (char **string, const char *value)
    when reading directory files.  This means that we can't use
    quotearg, as quotearg is locale-dependent and is meant for human
    consumption.  */
-char *
+static char *
 quote_copy_string (const char *string)
 {
   const char *source = string;
@@ -103,6 +98,7 @@ quote_copy_string (const char *string)
     }
   return 0;
 }
+#endif
 
 /* Takes a quoted C string (like those produced by quote_copy_string)
    and turns it back into the un-quoted original.  This is done in
@@ -394,7 +390,7 @@ static char *before_backup_name;
 static char *after_backup_name;
 
 /* Return 1 if FILE_NAME is obviously "." or "/".  */
-static bool
+bool
 must_be_dot_or_slash (char const *file_name)
 {
   file_name += FILE_SYSTEM_PREFIX_LEN (file_name);
@@ -617,31 +613,31 @@ deref_stat (bool deref, char const *name, struct stat *buf)
   return deref ? stat (name, buf) : lstat (name, buf);
 }
 
-/* Set FD's (i.e., FILE's) access time to TIMESPEC[0].  If that's not
-   possible to do by itself, set its access and data modification
-   times to TIMESPEC[0] and TIMESPEC[1], respectively.  */
+/* Set FD's (i.e., assuming the working directory is PARENTFD, FILE's)
+   access time to ATIME.  ATFLAG controls symbolic-link following, in
+   the style of openat.  */
 int
-set_file_atime (int fd, char const *file, struct timespec const timespec[2])
+set_file_atime (int fd, int parentfd, char const *file, struct timespec atime,
+               int atflag)
 {
-#ifdef _FIOSATIME
-  if (0 <= fd)
-    {
-      struct timeval timeval;
-      timeval.tv_sec = timespec[0].tv_sec;
-      timeval.tv_usec = timespec[0].tv_nsec / 1000;
-      if (ioctl (fd, _FIOSATIME, &timeval) == 0)
-       return 0;
-    }
-#endif
-
-  return gl_futimens (fd, file, timespec);
+  struct timespec ts[2];
+  ts[0] = atime;
+  ts[1].tv_nsec = UTIME_OMIT;
+  return fdutimensat (fd, parentfd, file, ts, atflag);
 }
 
 /* A description of a working directory.  */
 struct wd
 {
+  /* The directory's name.  */
   char const *name;
-  int saved;
+
+  /* A negative value if no attempt has been made to save the
+     directory, 0 if it was saved successfully, and a positive errno
+     value if it was not saved successfully.  */
+  int err;
+
+  /* The saved version of the directory, if ERR == 0.  */
   struct saved_cwd saved_cwd;
 };
 
@@ -680,7 +676,7 @@ chdir_arg (char const *dir)
       if (! wd_count)
        {
          wd[wd_count].name = ".";
-         wd[wd_count].saved = 0;
+         wd[wd_count].err = -1;
          wd_count++;
        }
     }
@@ -697,28 +693,28 @@ chdir_arg (char const *dir)
     }
 
   wd[wd_count].name = dir;
-  wd[wd_count].saved = 0;
+  wd[wd_count].err = -1;
   return wd_count++;
 }
 
+/* Index of current directory.  */
+int chdir_current;
+
 /* Change to directory I.  If I is 0, change to the initial working
    directory; otherwise, I must be a value returned by chdir_arg.  */
 void
 chdir_do (int i)
 {
-  static int previous;
-
-  if (previous != i)
+  if (chdir_current != i)
     {
-      struct wd *prev = &wd[previous];
+      struct wd *prev = &wd[chdir_current];
       struct wd *curr = &wd[i];
 
-      if (! prev->saved)
+      if (prev->err < 0)
        {
-         int err = 0;
-         prev->saved = 1;
+         prev->err = 0;
          if (save_cwd (&prev->saved_cwd) != 0)
-           err = errno;
+           prev->err = errno;
          else if (0 <= prev->saved_cwd.desc)
            {
              /* Make sure we still have at least one descriptor available.  */
@@ -733,20 +729,20 @@ chdir_do (int i)
                  prev->saved_cwd.desc = -1;
                  prev->saved_cwd.name = xgetcwd ();
                  if (! prev->saved_cwd.name)
-                   err = errno;
+                   prev->err = errno;
                }
              else
-               err = errno;
+               prev->err = errno;
            }
-
-         if (err)
-           FATAL_ERROR ((0, err, _("Cannot save working directory")));
        }
 
-      if (curr->saved)
+      if (0 <= curr->err)
        {
-         if (restore_cwd (&curr->saved_cwd))
-           FATAL_ERROR ((0, 0, _("Cannot change working directory")));
+         int err = curr->err;
+         if (err == 0 && restore_cwd (&curr->saved_cwd) != 0)
+           err = errno;
+         if (err)
+           FATAL_ERROR ((0, err, _("Cannot restore working directory")));
        }
       else
        {
@@ -756,7 +752,7 @@ chdir_do (int i)
            chdir_fatal (curr->name);
        }
 
-      previous = i;
+      chdir_current = i;
     }
 }
 \f