version 1.97, 2016/10/18 17:11:43 |
version 1.98, 2016/11/03 20:13:41 |
|
|
rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf)); |
rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf)); |
|
|
if (cf->file_ent->ce_conflict == NULL) { |
if (cf->file_ent->ce_conflict == NULL) { |
(void)strlcpy(timebuf, cf->file_ent->ce_time, |
if (cvs_server_active == 0) { |
sizeof(timebuf)); |
(void)strlcpy(timebuf, cf->file_ent->ce_time, |
|
sizeof(timebuf)); |
|
} else { |
|
timebuf[0] = '\0'; |
|
} |
} else { |
} else { |
len = strlcpy(timebuf, cf->file_ent->ce_conflict, |
len = strlcpy(timebuf, cf->file_ent->ce_conflict, |
sizeof(timebuf)); |
sizeof(timebuf)); |