version 1.170, 2015/02/05 12:59:57 |
version 1.171, 2015/11/05 09:48:21 |
|
|
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#include <stdint.h> |
#include <stdint.h> |
|
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
|
|
cvs_parse_tagfile(cf->file_wd, &dirtag, NULL, NULL); |
cvs_parse_tagfile(cf->file_wd, &dirtag, NULL, NULL); |
cvs_mkpath(cf->file_path, cvs_specified_tag != NULL ? |
cvs_mkpath(cf->file_path, cvs_specified_tag != NULL ? |
cvs_specified_tag : dirtag); |
cvs_specified_tag : dirtag); |
if (dirtag != NULL) |
free(dirtag); |
xfree(dirtag); |
|
|
|
if ((cf->fd = open(cf->file_path, O_RDONLY)) == -1) |
if ((cf->fd = open(cf->file_path, O_RDONLY)) == -1) |
fatal("cvs_update_enterdir: `%s': %s", |
fatal("cvs_update_enterdir: `%s': %s", |
|
|
|
|
entlist = cvs_ent_open(cf->file_wd); |
entlist = cvs_ent_open(cf->file_wd); |
cvs_ent_add(entlist, entry); |
cvs_ent_add(entlist, entry); |
xfree(entry); |
free(entry); |
} |
} |
} else if ((cf->file_status == DIR_CREATE && build_dirs == 0) || |
} else if ((cf->file_status == DIR_CREATE && build_dirs == 0) || |
cf->file_status == FILE_UNKNOWN) { |
cf->file_status == FILE_UNKNOWN) { |
|
|
if (nbytes == -1) |
if (nbytes == -1) |
fatal("cvs_update_leavedir: %s", strerror(errno)); |
fatal("cvs_update_leavedir: %s", strerror(errno)); |
|
|
xfree(buf); |
free(buf); |
|
|
prune_it: |
prune_it: |
if ((isempty == 1 && prune_dirs == 1) || |
if ((isempty == 1 && prune_dirs == 1) || |
|
|
|
|
entlist = cvs_ent_open(cf->file_wd); |
entlist = cvs_ent_open(cf->file_wd); |
cvs_ent_add(entlist, entry); |
cvs_ent_add(entlist, entry); |
xfree(entry); |
free(entry); |
} |
} |
|
|
/* |
/* |
|
|
} |
} |
|
|
cvs_freelines(lines); |
cvs_freelines(lines); |
xfree(content); |
free(content); |
return (conflict); |
return (conflict); |
} |
} |
|
|
|
|
if (rev2 != NULL) |
if (rev2 != NULL) |
rcsnum_free(rev2); |
rcsnum_free(rev2); |
|
|
if (jrev1 != NULL) |
free(jrev1); |
xfree(jrev1); |
free(jrev2); |
if (jrev2 != NULL) |
|
xfree(jrev2); |
|
} |
} |
|
|
void |
void |