oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename all st_mtime variables to avoid conflict with #define.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8087 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-04-02 21:25:29 +00:00
parent 56711d168d
commit c7c7a33ef6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/ftp/ftp/cmds.c
View File

@@ -647,7 +647,7 @@ getit(int argc, char **argv, int restartit, char *mode)
int cmdret; int cmdret;
int yy, mo, day, hour, min, sec; int yy, mo, day, hour, min, sec;
struct tm *tm; struct tm *tm;
time_t st_mtime = stbuf.st_mtime; time_t mtime = stbuf.st_mtime;
overbose = verbose; overbose = verbose;
if (debug == 0) if (debug == 0)
@@ -666,7 +666,7 @@ getit(int argc, char **argv, int restartit, char *mode)
return (0); return (0);
} }
tm = gmtime(&st_mtime); tm = gmtime(&mtime);
tm->tm_mon++; tm->tm_mon++;
tm->tm_year += 1900; tm->tm_year += 1900;

4
appl/ftp/ftpd/ftpcmd.y
View File

@@ -620,9 +620,9 @@ cmd
"%s: not a plain file.", $3); "%s: not a plain file.", $3);
} else { } else {
struct tm *t; struct tm *t;
time_t st_mtime = stbuf.st_mtime; time_t mtime = stbuf.st_mtime;
t = gmtime(&st_mtime); t = gmtime(&mtime);
reply(213, reply(213,
"%04d%02d%02d%02d%02d%02d", "%04d%02d%02d%02d%02d%02d",
t->tm_year + 1900, t->tm_year + 1900,

8
appl/ftp/ftpd/ls.c
View File

@@ -177,10 +177,10 @@ make_fileinfo(const char *filename, struct fileinfo *file, int flags)
{ {
time_t t = time(NULL); time_t t = time(NULL);
time_t st_mtime = st->st_mtime; time_t mtime = st->st_mtime;
struct tm *tm = localtime(&st_mtime); struct tm *tm = localtime(&mtime);
if((t - st_mtime > 6*30*24*60*60) || if((t - mtime > 6*30*24*60*60) ||
(st_mtime - t > 6*30*24*60*60)) (mtime - t > 6*30*24*60*60))
strftime(buf, sizeof(buf), "%b %e %Y", tm); strftime(buf, sizeof(buf), "%b %e %Y", tm);
else else
strftime(buf, sizeof(buf), "%b %e %H:%M", tm); strftime(buf, sizeof(buf), "%b %e %H:%M", tm);