summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1999-01-04 19:21:51 +0000
committerJeremy Allison <jra@samba.org>1999-01-04 19:21:51 +0000
commit0258a4e63b9c1ee47cb492f52e86119fb2671ab2 (patch)
tree85cda2e5eeb20da28c15aaa62028de090fa85e76 /source/lib
parente8393f32c81e6c16c7db870198e7bded2ce56e5b (diff)
downloadsamba-0258a4e63b9c1ee47cb492f52e86119fb2671ab2.tar.gz
samba-0258a4e63b9c1ee47cb492f52e86119fb2671ab2.tar.xz
samba-0258a4e63b9c1ee47cb492f52e86119fb2671ab2.zip
acconfig.h configure configure.in include/config.h.in lib/system.c: Fixed --with-mmap code.
lib/time.c: Changed %T to %H:%M:%S for systems that don't have %T. locking/locking_slow.c: Re-added FTRUNCATE_NEEDS_ROOT code - now to test for it... smbd/quotas.c: Fixed IRIX quota compile. Jeremy.
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/system.c4
-rw-r--r--source/lib/time.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/lib/system.c b/source/lib/system.c
index c1e4aa5122c..9655abd9b9e 100644
--- a/source/lib/system.c
+++ b/source/lib/system.c
@@ -277,7 +277,7 @@ FILE *sys_fopen(const char *path, const char *type)
#endif
}
-#if defined(HAVE_SHARED_MMAP)
+#if defined(HAVE_MMAP)
/*******************************************************************
An mmap() wrapper that will deal with 64 bit filesizes.
@@ -292,7 +292,7 @@ void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, SMB_OFF_T of
#endif
}
-#endif /* HAVE_SHARED_MMAP */
+#endif /* HAVE_MMAP */
/*******************************************************************
A readdir wrapper that will deal with 64 bit filesizes.
diff --git a/source/lib/time.c b/source/lib/time.c
index 3cea1a3e14a..420f31e526f 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -516,7 +516,7 @@ char *timestring(void )
slprintf(TimeBuf,sizeof(TimeBuf)-1,"%ld seconds since the Epoch",(long)t);
} else {
#ifdef HAVE_STRFTIME
- strftime(TimeBuf,100,"%Y/%m/%d %T",tm);
+ strftime(TimeBuf,100,"%Y/%m/%d %H:%M:%S",tm);
#else
fstrcpy(TimeBuf, asctime(tm));
#endif