n = buf2;
break;
case 'G':
- strlcat(fmt, "d", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt,
- (long)file->gid);
- n = buf2;
+ if (file->gid == GID_NONE)
+ n = "DEFAULT";
+ else {
+ strlcat(fmt, "ld", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt,
+ (long)file->gid);
+ n = buf2;
+ }
break;
case 'p':
strlcat(fmt, "ld", sizeof fmt);
case 'M':
n = timestring(file->modtime);
{
- char *cp = strchr(n, ' ');
- if (cp)
+ char *cp = n;
+ while ((cp = strchr(cp, ' ')) != NULL)
*cp = '-';
}
break;
/* VANISHED is not an error, only a warning */
if (code == RERR_VANISHED) {
- rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d)\n",
- name, code, file, line);
+ rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s]\n",
+ name, code, file, line, who_am_i());
} else {
- rprintf(FERROR, "rsync error: %s (code %d) at %s(%d)\n",
- name, code, file, line);
+ rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s]\n",
+ name, code, file, line, who_am_i());
}
}
}