[BACK]Return to getcwd.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libc / gen

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libc/gen/getcwd.c between version 1.24.4.3 and 1.30

version 1.24.4.3, 2004/05/12 04:20:34 version 1.30, 2003/08/03 04:14:00
Line 95  realpath(path, resolved)
Line 95  realpath(path, resolved)
   
         /* Save the starting point. */          /* Save the starting point. */
         if ((fd = open(".", O_RDONLY)) < 0) {          if ((fd = open(".", O_RDONLY)) < 0) {
                 (void)strcpy(resolved, ".");                  (void)strlcpy(resolved, ".", MAXPATHLEN);
                 return (NULL);                  return (NULL);
         }          }
   
Line 107  realpath(path, resolved)
Line 107  realpath(path, resolved)
          *     if it is a directory, then change to that directory.           *     if it is a directory, then change to that directory.
          * get the current directory name and append the basename.           * get the current directory name and append the basename.
          */           */
         (void)strncpy(resolved, path, MAXPATHLEN - 1);          (void)strlcpy(resolved, path, MAXPATHLEN);
         resolved[MAXPATHLEN - 1] = '\0';  
 loop:  loop:
         q = strrchr(resolved, '/');          q = strrchr(resolved, '/');
         if (q != NULL) {          if (q != NULL) {
Line 176  loop:
Line 175  loop:
                         goto err1;                          goto err1;
                 }                  }
                 if (rootd == 0)                  if (rootd == 0)
                         (void)strcat(resolved, "/"); /* XXX: strcat is safe */                          (void)strlcat(resolved, "/", MAXPATHLEN);
                 (void)strcat(resolved, wbuf);   /* XXX: strcat is safe */                  (void)strlcat(resolved, wbuf, MAXPATHLEN);
         }          }
   
         /* Go back to where we came from. */          /* Go back to where we came from. */

Legend:
Removed from v.1.24.4.3  
changed lines
  Added in v.1.30

CVSweb <webmaster@jp.NetBSD.org>