=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v retrieving revision 1.68 retrieving revision 1.69 diff -c -r1.68 -r1.69 *** src/usr.bin/cvs/update.c 2006/05/30 21:32:52 1.68 --- src/usr.bin/cvs/update.c 2006/05/31 22:25:59 1.69 *************** *** 1,4 **** ! /* $OpenBSD: update.c,v 1.68 2006/05/30 21:32:52 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * --- 1,4 ---- ! /* $OpenBSD: update.c,v 1.69 2006/05/31 22:25:59 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * *************** *** 140,146 **** { long base; int nbytes; ! int isempty; size_t bufsize; struct stat st; struct dirent *dp; --- 140,146 ---- { long base; int nbytes; ! int isempty, l; size_t bufsize; struct stat st; struct dirent *dp; *************** *** 148,156 **** --- 148,173 ---- struct cvs_ent *ent; struct cvs_ent_line *line; CVSENTRIES *entlist; + char *export; cvs_log(LP_TRACE, "cvs_update_leavedir(%s)", cf->file_path); + if (cvs_cmdop == CVS_OP_EXPORT) { + export = xmalloc(MAXPATHLEN); + l = snprintf(export, MAXPATHLEN, "%s/%s", cf->file_path, + CVS_PATH_CVSDIR); + if (l == -1 || l >= MAXPATHLEN) + fatal("cvs_update_leavedir: overflow"); + + /* XXX */ + if (cvs_rmdir(export) == -1) + fatal("cvs_update_leavedir: %s: %s:", export, + strerror(errno)); + + xfree(export); + return; + } + if (fstat(cf->fd, &st) == -1) fatal("cvs_update_leavedir: %s", strerror(errno)); *************** *** 209,214 **** --- 226,232 ---- xfree(buf); if (isempty == 1 && prune_dirs == 1) { + /* XXX */ cvs_rmdir(cf->file_path); entlist = cvs_ent_open(cf->file_wd);