move timegm declaration to utils.h

[project/uhttpd.git] / file.c

diff --git a/file.c b/file.c
index 22eb048..9268577 100644 (file)
--- a/file.c
+++ b/file.c
@@ -246,10 +246,6 @@ uh_path_lookup(struct client *cl, const char *url)
        return p.phys ? &p : NULL;
 }
 
-#ifdef __APPLE__
-time_t timegm (struct tm *tm);
-#endif
-
 static const char * uh_file_mime_lookup(const char *path)
 {
        struct mimetype *m = &uh_mime_types[0];
@@ -293,11 +289,11 @@ static time_t uh_file_date2unix(const char *date)
        return 0;
 }
 
-static char * uh_file_unix2date(time_t ts, char *buf)
+static char * uh_file_unix2date(time_t ts, char *buf, int len)
 {
        struct tm *t = gmtime(&ts);
 
-       strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", t);
+       strftime(buf, len, "%a, %d %b %Y %H:%M:%S GMT", t);
 
        return buf;
 }
@@ -317,9 +313,10 @@ static void uh_file_response_ok_hdrs(struct client *cl, struct stat *s)
        if (s) {
                ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf));
                ustream_printf(cl->us, "Last-Modified: %s\r\n",
-                              uh_file_unix2date(s->st_mtime, buf));
+                              uh_file_unix2date(s->st_mtime, buf, sizeof(buf)));
        }
-       ustream_printf(cl->us, "Date: %s\r\n", uh_file_unix2date(time(NULL), buf));
+       ustream_printf(cl->us, "Date: %s\r\n",
+                      uh_file_unix2date(time(NULL), buf, sizeof(buf)));
 }
 
 static void uh_file_response_200(struct client *cl, struct stat *s)
@@ -445,7 +442,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 {
        int i;
        int count = 0;
-       char filename[PATH_MAX];
+       char *filename = uh_buf;
        char *pathptr;
        struct dirent **files = NULL;
        struct stat s;
@@ -462,14 +459,16 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
        if ((count = scandir(pi->phys, &files, uh_file_scandir_filter_dir,
                                                 alphasort)) > 0)
        {
-               memset(filename, 0, sizeof(filename));
-               memcpy(filename, pi->phys, sizeof(filename));
-               pathptr = &filename[strlen(filename)];
+               int len;
+
+               strcpy(filename, pi->phys);
+               len = strlen(filename);
+               pathptr = filename + len;
+               len = PATH_MAX - len;
 
                /* list subdirs */
                for (i = 0; i < count; i++) {
-                       strncat(filename, files[i]->d_name,
-                                       sizeof(filename) - strlen(files[i]->d_name));
+                       snprintf(pathptr, len, "%s", files[i]->d_name);
 
                        if (!stat(filename, &s) &&
                                (s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH))
@@ -480,7 +479,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
                                        "<br /></small></li>",
                                        pi->name, files[i]->d_name,
                                        files[i]->d_name,
-                                       uh_file_unix2date(s.st_mtime, buf),
+                                       uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
                                        s.st_size / 1024.0);
 
                        *pathptr = 0;
@@ -488,8 +487,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 
                /* list files */
                for (i = 0; i < count; i++) {
-                       strncat(filename, files[i]->d_name,
-                                       sizeof(filename) - strlen(files[i]->d_name));
+                       snprintf(pathptr, len, "%s", files[i]->d_name);
 
                        if (!stat(filename, &s) &&
                                !(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH))
@@ -500,7 +498,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
                                        "<br /></small></li>",
                                        pi->name, files[i]->d_name,
                                        files[i]->d_name,
-                                       uh_file_unix2date(s.st_mtime, buf),
+                                       uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
                                        uh_file_mime_lookup(filename),
                                        s.st_size / 1024.0);