Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore setfacl unless it tells us that it supports the -k option.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
d37ab61
..
e33c7e8
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-1138,6
+1138,7
@@
char *timestring(time_t t)
{
static char TimeBuf[200];
struct tm *tm = localtime(&t);
{
static char TimeBuf[200];
struct tm *tm = localtime(&t);
+ char *p;
#ifdef HAVE_STRFTIME
strftime(TimeBuf, sizeof TimeBuf - 1, "%Y/%m/%d %H:%M:%S", tm);
#ifdef HAVE_STRFTIME
strftime(TimeBuf, sizeof TimeBuf - 1, "%Y/%m/%d %H:%M:%S", tm);
@@
-1145,11
+1146,10
@@
char *timestring(time_t t)
strlcpy(TimeBuf, asctime(tm), sizeof TimeBuf);
#endif
strlcpy(TimeBuf, asctime(tm), sizeof TimeBuf);
#endif
- if (TimeBuf[strlen(TimeBuf)-1] == '\n') {
- TimeBuf[strlen(TimeBuf)-1] = 0;
- }
+ if ((p = strchr(TimeBuf, '\n')) != NULL)
+ *p = '\0';
- return
(TimeBuf)
;
+ return
TimeBuf
;
}
}