summaryrefslogtreecommitdiff
path: root/source3/lib/time.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-02 01:01:24 +0000
committerJeremy Allison <jra@samba.org>1998-04-02 01:01:24 +0000
commit612cbb6a6039c2cafb3de5e644f23a2a26d6c645 (patch)
tree8170678ed3ed75b7411cfd8d7387940783069ffc /source3/lib/time.c
parentd99d6f0d2e956037f5a60250b044ccdde9d6a330 (diff)
downloadsamba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.tar.gz
samba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.tar.bz2
samba-612cbb6a6039c2cafb3de5e644f23a2a26d6c645.zip
Patch from Chris Maltby <chris@softway.com.au>. His comments follow:
+ improvement to smbtar to allow exclusion/inclusion of system and hidden files, and to generate a listing of what has been archived in a format useful for automated backup systems. + add the "Softq" spooling system to samba's printing capabilities. + I have "fixed" the intrusion of US style dates into samba reporting as well. The format yyyy/mm/dd is not only uunambiguous, but also has the benefit of making lexicographic sorts work correctly. Jeremy. (This used to be commit f9dacd1d8b89fccad859c0c6bc7a492823eb4b06)
Diffstat (limited to 'source3/lib/time.c')
-rw-r--r--source3/lib/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 050b4725a7..716f5d62cc 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -478,19 +478,19 @@ char *timestring(void )
#ifdef NO_STRFTIME
fstrcpy(TimeBuf, asctime(tm));
#elif defined(CLIX) || defined(CONVEX)
- strftime(TimeBuf,100,"%m/%d/%Y %I:%M:%S %p",tm);
+ strftime(TimeBuf,100,"%Y/%m/%d %I:%M:%S %p",tm);
#elif defined(AMPM)
- strftime(TimeBuf,100,"%m/%d/%Y %r",tm);
+ strftime(TimeBuf,100,"%Y/%m/%d %r",tm);
#elif defined(TZ_TIME)
{
int zone = TimeDiff(t);
int absZoneMinutes = (zone<0 ? -zone : zone) / 60;
- size_t len = strftime(TimeBuf,sizeof(TimeBuf)-6,"%m/%d/%Y %T",tm);
+ size_t len = strftime(TimeBuf,sizeof(TimeBuf)-6,"%Y/%m/%d %T",tm);
sprintf(TimeBuf+len," %c%02d%02d",
zone<0?'+':'-',absZoneMinutes/60,absZoneMinutes%60);
}
#else
- strftime(TimeBuf,100,"%m/%d/%Y %T",tm);
+ strftime(TimeBuf,100,"%Y/%m/%d %T",tm);
#endif
return(TimeBuf);
}