Use fstatat() instead of crafting a filename to use with stat()

ok millert@

diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index e000687..38ef72e 100644 (file)
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ftpd.c,v 1.216 2016/05/04 19:48:08 jca Exp $  */
+/*     $OpenBSD: ftpd.c,v 1.217 2016/07/04 03:24:48 guenther Exp $     */
 /*     $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $        */
 
 /*
@@ -2635,6 +2635,7 @@ send_file_list(char *whichf)
        int simple = 0;
        volatile int freeglob = 0;
        glob_t gl;
+       size_t prefixlen;
 
        if (strpbrk(whichf, "~{[*?") != NULL) {
                memset(&gl, 0, sizeof(gl));
@@ -2694,9 +2695,11 @@ send_file_list(char *whichf)
                if ((dirp = opendir(dirname)) == NULL)
                        continue;
 
+               if (dirname[0] == '.' && dirname[1] == '\0')
+                       prefixlen = 0;
+               else
+                       prefixlen = strlen(dirname) + 1;
                while ((dir = readdir(dirp)) != NULL) {
-                       char nbuf[PATH_MAX];
-
                        if (recvurg) {
                                myoob();
                                recvurg = 0;
@@ -2710,14 +2713,12 @@ send_file_list(char *whichf)
                            dir->d_namlen == 2)
                                continue;
 
-                       snprintf(nbuf, sizeof(nbuf), "%s/%s", dirname,
-                                dir->d_name);
-
                        /*
                         * We have to do a stat to insure it's
                         * not a directory or special file.
                         */
-                       if (simple || (stat(nbuf, &st) == 0 &&
+                       if (simple ||
+                           (fstatat(dirfd(dirp), dir->d_name, &st, 0) == 0 &&
                            S_ISREG(st.st_mode))) {
                                if (dout == NULL) {
                                        dout = dataconn("file list", (off_t)-1,
@@ -2726,13 +2727,14 @@ send_file_list(char *whichf)
                                                goto out;
                                        transflag++;
                                }
-                               if (nbuf[0] == '.' && nbuf[1] == '/')
-                                       fprintf(dout, "%s%s\n", &nbuf[2],
-                                               type == TYPE_A ? "\r" : "");
-                               else
-                                       fprintf(dout, "%s%s\n", nbuf,
-                                               type == TYPE_A ? "\r" : "");
-                               byte_count += strlen(nbuf) + 1;
+
+                               if (prefixlen) {
+                                       fprintf(dout, "%s/", dirname);
+                                       byte_count += prefixlen;
+                               }
+                               fprintf(dout, "%s%s\n", dir->d_name,
+                                   type == TYPE_A ? "\r" : "");
+                               byte_count += dir->d_namlen + 1;
                        }
                }
                (void) closedir(dirp);

diff --git a/usr.bin/mg/fileio.c b/usr.bin/mg/fileio.c
index 0c5a9e2..b03586e 100644 (file)
--- a/usr.bin/mg/fileio.c
+++ b/usr.bin/mg/fileio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fileio.c,v 1.100 2016/01/26 18:02:51 jasper Exp $     */
+/*     $OpenBSD: fileio.c,v 1.101 2016/07/04 03:24:48 guenther Exp $   */
 
 /* This file is in the public domain. */
 
@@ -526,14 +526,8 @@ make_file_list(char *buf)
                } else if (dent->d_type == DT_LNK ||
                            dent->d_type == DT_UNKNOWN) {
                        struct stat     statbuf;
-                       char            statname[NFILEN + 2];
 
-                       statbuf.st_mode = 0;
-                       ret = snprintf(statname, sizeof(statname), "%s/%s",
-                           dir, dent->d_name);
-                       if (ret < 0 || ret > sizeof(statname) - 1)
-                               continue;
-                       if (stat(statname, &statbuf) < 0)
+                       if (fstatat(dirfd(dirp), dent->d_name, &statbuf, 0) < 0)
                                continue;
                        if (S_ISDIR(statbuf.st_mode))
                                isdir = 1;