Imported Upstream version 1.5

[debian/gzip] / lib / chdir-long.c

diff --git a/lib/chdir-long.c b/lib/chdir-long.c
index 28e24070e9bfef285c3435a01166dcd71cf4b31f..599d14157a9138823f17267f031c504547ad65a9 100644 (file)
--- a/lib/chdir-long.c
+++ b/lib/chdir-long.c
@@ -1,5 +1,5 @@
 /* provide a chdir function that tries not to fail due to ENAMETOOLONG
 /* provide a chdir function that tries not to fail due to ENAMETOOLONG

-   Copyright (C) 2004-2010 Free Software Foundation, Inc.
+   Copyright (C) 2004-2012 Free Software Foundation, Inc.

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -72,7 +72,7 @@ static int
 cdb_advance_fd (struct cd_buf *cdb, char const *dir)
 {
   int new_fd = openat (cdb->fd, dir,
 cdb_advance_fd (struct cd_buf *cdb, char const *dir)
 {
   int new_fd = openat (cdb->fd, dir,

-                       O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK);
+                       O_SEARCH | O_DIRECTORY | O_NOCTTY | O_NONBLOCK);

   if (new_fd < 0)
     return -1;
 
   if (new_fd < 0)
     return -1;
 


@@ -83,7 +83,7 @@ cdb_advance_fd (struct cd_buf *cdb, char const *dir)
 }
 
 /* Return a pointer to the first non-slash in S.  */
 }
 
 /* Return a pointer to the first non-slash in S.  */

-static inline char *
+static inline char * _GL_ATTRIBUTE_PURE

 find_non_slash (char const *s)
 {
   size_t n_slash = strspn (s, "/");
 find_non_slash (char const *s)
 {
   size_t n_slash = strspn (s, "/");


@@ -96,7 +96,7 @@ find_non_slash (char const *s)
    name.  It handles an arbitrarily long directory name by operating
    on manageable portions of the name.  On systems without the openat
    syscall, this means changing the working directory to more and more
    name.  It handles an arbitrarily long directory name by operating
    on manageable portions of the name.  On systems without the openat
    syscall, this means changing the working directory to more and more

-   `distant' points along the long directory name and then restoring
+   "distant" points along the long directory name and then restoring

    the working directory.  If any of those attempts to save or restore
    the working directory fails, this function exits nonzero.
 
    the working directory.  If any of those attempts to save or restore
    the working directory fails, this function exits nonzero.
 


@@ -245,7 +245,7 @@ main (int argc, char *argv[])
 
   if (argc <= 1)
     {
 
   if (argc <= 1)
     {

-      /* Using `pwd' here makes sense only if it is a robust implementation,
+      /* Using 'pwd' here makes sense only if it is a robust implementation,

          like the one in coreutils after the 2004-04-19 changes.  */
       char const *cmd = "pwd";
       execlp (cmd, (char *) NULL);
          like the one in coreutils after the 2004-04-19 changes.  */
       char const *cmd = "pwd";
       execlp (cmd, (char *) NULL);