Update XZ Utils to 5.0.3 (in deps)

src/xz/file_io.c

 ///////////////////////////////////////////////////////////////////////////////
 //
 /// \file       file_io.c
 /// \brief      File opening, unlinking, and closing
 //
 //  Author:     Lasse Collin
 //
 //  This file has been put into the public domain.
 //  You can do whatever you want with this file.
 //
@@ skipping 35 matching lines @@
 static int stdout_flags = 0;
 #endif
 
 
 static bool io_write_buf(file_pair *pair, const uint8_t *buf, size_t size);
 
 
 extern void
 io_init(void)
 {
-        // Make sure that stdin, stdout, and and stderr are connected to
+        // Make sure that stdin, stdout, and stderr are connected to
         // a valid file descriptor. Exit immediately with exit code ERROR
         // if we cannot make the file descriptors valid. Maybe we should
         // print an error message, but our stderr could be screwed anyway.
         tuklib_open_stdxxx(E_ERROR);
 
 #ifndef TUKLIB_DOSLIKE
         // If fchown() fails setting the owner, we warn about it only if
         // we are root.
         warn_fchown = geteuid() == 0;
 #endif
@@ skipping 296 matching lines @@
         if (pair->src_fd == -1) {
                 // If we were interrupted, don't display any error message.
                 if (errno == EINTR) {
                         // All the signals that don't have SA_RESTART
                         // set user_abort.
                         assert(user_abort);
                         return true;
                 }
 
 #ifdef O_NOFOLLOW
-                // Give an understandable error message in if reason
+                // Give an understandable error message if the reason
                 // for failing was that the file was a symbolic link.
                 //
                 // Note that at least Linux, OpenBSD, Solaris, and Darwin
-                // use ELOOP to indicate if O_NOFOLLOW was the reason
+                // use ELOOP to indicate that O_NOFOLLOW was the reason
                 // that open() failed. Because there may be
                 // directories in the pathname, ELOOP may occur also
                 // because of a symlink loop in the directory part.
-                // So ELOOP doesn't tell us what actually went wrong.
+                // So ELOOP doesn't tell us what actually went wrong,
+                // and this stupidity went into POSIX-1.2008 too.
                 //
                 // FreeBSD associates EMLINK with O_NOFOLLOW and
                 // Tru64 uses ENOTSUP. We use these directly here
                 // and skip the lstat() call and the associated race.
                 // I want to hear if there are other kernels that
                 // fail with something else than ELOOP with O_NOFOLLOW.
                 bool was_symlink = false;
 
 #       if defined(__FreeBSD__) || defined(__DragonFly__)
                 if (errno == EMLINK)
                         was_symlink = true;
 
 #       elif defined(__digital__) && defined(__unix__)
                 if (errno == ENOTSUP)
                         was_symlink = true;
 
 #       elif defined(__NetBSD__)
-                // FIXME? As of 2008-11-20, NetBSD doesn't document what
-                // errno is used with O_NOFOLLOW. It seems to be EFTYPE,
-                // but since it isn't documented, it may be wrong to rely
-                // on it here.
+                // As of 2010-09-05, NetBSD doesn't document what errno is
+                // used with O_NOFOLLOW. It is EFTYPE though, and I
+                // understood that is very unlikely to change even though
+                // it is undocumented.
                 if (errno == EFTYPE)
                         was_symlink = true;
 
 #       else
                 if (errno == ELOOP && !follow_symlinks) {
                         const int saved_errno = errno;
                         struct stat st;
                         if (lstat(pair->src_name, &st) == 0
                                         && S_ISLNK(st.st_mode))
                                 was_symlink = true;
@@ skipping 36 matching lines @@
         // the permissions, and when unlinking.
         if (fstat(pair->src_fd, &pair->src_st))
                 goto error_msg;
 
         if (S_ISDIR(pair->src_st.st_mode)) {
                 message_warning(_("%s: Is a directory, skipping"),
                                 pair->src_name);
                 goto error;
         }
 
-        if (reg_files_only) {
-                if (!S_ISREG(pair->src_st.st_mode)) {
-                        message_warning(_("%s: Not a regular file, "
-                                        "skipping"), pair->src_name);
-                        goto error;
-                }
+        if (reg_files_only && !S_ISREG(pair->src_st.st_mode)) {
+                message_warning(_("%s: Not a regular file, skipping"),
+                                pair->src_name);
+                goto error;
+        }
 
-                // These are meaningless on Windows.
 #ifndef TUKLIB_DOSLIKE
+        if (reg_files_only && !opt_force) {
                 if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) {
                         // gzip rejects setuid and setgid files even
                         // when --force was used. bzip2 doesn't check
                         // for them, but calls fchown() after fchmod(),
                         // and many systems automatically drop setuid
                         // and setgid bits there.
                         //
                         // We accept setuid and setgid files if
                         // --force was used. We drop these bits
                         // explicitly in io_copy_attr().
                         message_warning(_("%s: File has setuid or "
                                         "setgid bit set, skipping"),
                                         pair->src_name);
                         goto error;
                 }
 
                 if (pair->src_st.st_mode & S_ISVTX) {
                         message_warning(_("%s: File has sticky bit "
                                         "set, skipping"),
                                         pair->src_name);
                         goto error;
                 }
 
                 if (pair->src_st.st_nlink > 1) {
                         message_warning(_("%s: Input file has more "
                                         "than one hard link, "
                                         "skipping"), pair->src_name);
                         goto error;
                 }
+        }
 #endif
-        }
 
         return false;
 
 error_msg:
         message_error("%s: %s", pair->src_name, strerror(errno));
 error:
         (void)close(pair->src_fd);
         return true;
 }
 
@@ skipping 439 matching lines @@
                                                 strerror(errno));
                                 return true;
                         }
 
                         pair->dest_pending_sparse = 0;
                 }
         }
 
         return io_write_buf(pair, buf->u8, size);
 }