X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3ed8eafccb0f8880be295e67486347e5ffd93320..00f00f846b20b4d6bc0eee2668b0c50fd4531a48:/util.c diff --git a/util.c b/util.c index d37ab61e..e33c7e83 100644 --- a/util.c +++ b/util.c @@ -1138,6 +1138,7 @@ char *timestring(time_t 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); @@ -1145,11 +1146,10 @@ char *timestring(time_t t) 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; }