/* $OpenBSD: add.c,v 1.30 2005/09/15 17:01:10 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * Copyright (c) 2005 Xavier Santolaria * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include #include #include #include #include "cvs.h" #include "log.h" #include "proto.h" extern char *__progname; static int cvs_add_remote(CVSFILE *, void *); static int cvs_add_local(CVSFILE *, void *); static int cvs_add_init(struct cvs_cmd *, int, char **, int *); static int cvs_add_pre_exec(struct cvsroot *); static int cvs_add_directory(CVSFILE *); #if 0 static int cvs_add_build_entry(CVSFILE *); #endif struct cvs_cmd cvs_cmd_add = { CVS_OP_ADD, CVS_REQ_ADD, "add", { "ad", "new" }, "Add a new file/directory to the repository", "[-k mode] [-m msg] file ...", "k:m:", NULL, 0, cvs_add_init, cvs_add_pre_exec, cvs_add_remote, cvs_add_local, NULL, NULL, CVS_CMD_ALLOWSPEC | CVS_CMD_SENDDIR | CVS_CMD_SENDARGS2 }; static int kflag = RCS_KWEXP_DEFAULT; static char *koptstr; static char kbuf[16]; static int cvs_add_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg) { int ch; cvs_msg = NULL; while ((ch = getopt(argc, argv, cmd->cmd_opts)) != -1) { switch (ch) { case 'k': koptstr = optarg; kflag = rcs_kflag_get(koptstr); if (RCS_KWEXP_INVAL(kflag)) { cvs_log(LP_ERR, "invalid RCS keyword expansion mode"); rcs_kflag_usage(); return (CVS_EX_USAGE); } break; case 'm': if ((cvs_msg = strdup(optarg)) == NULL) { cvs_log(LP_ERRNO, "failed to copy message"); return (CVS_EX_DATA); } break; default: return (CVS_EX_USAGE); } } *arg = optind; return (0); } static int cvs_add_pre_exec(struct cvsroot *root) { kbuf[0] = '\0'; if (kflag != RCS_KWEXP_DEFAULT) { strlcpy(kbuf, "-k", sizeof(kbuf)); strlcat(kbuf, koptstr, sizeof(kbuf)); if (root->cr_method != CVS_METHOD_LOCAL) { if (cvs_sendarg(root, kbuf, 0) < 0) return (CVS_EX_PROTO); } } return (0); } static int cvs_add_remote(CVSFILE *cf, void *arg) { int ret; struct cvsroot *root; ret = 0; root = CVS_DIR_ROOT(cf); if (cf->cf_type == DT_DIR) { ret = cvs_senddir(root, cf); if (ret == -1) ret = CVS_EX_PROTO; return (ret); } if (cf->cf_cvstat == CVS_FST_UNKNOWN) ret = cvs_sendreq(root, CVS_REQ_ISMODIFIED, cf->cf_name); if (ret == -1) ret = CVS_EX_PROTO; return (ret); } static int cvs_add_local(CVSFILE *cf, void *arg) { int added; char numbuf[64]; added = 0; if (cf->cf_type == DT_DIR) { if (cvs_add_directory(cf) == -1) return (CVS_EX_FILE); return (0); } if ((!(cf->cf_flags & CVS_FILE_ONDISK)) && (cf->cf_cvstat != CVS_FST_LOST) && (cf->cf_cvstat != CVS_FST_REMOVED)) { if (verbosity > 1) cvs_log(LP_WARN, "nothing known about `%s'", cf->cf_name); return (0); } else if (cf->cf_cvstat == CVS_FST_ADDED) { if (verbosity > 1) cvs_log(LP_WARN, "`%s' has already been entered", cf->cf_name); return (0); } else if (cf->cf_cvstat == CVS_FST_REMOVED) { /* XXX remove '-' from CVS/Entries */ /* XXX check the file out */ rcsnum_tostr(cf->cf_lrev, numbuf, sizeof(numbuf)); cvs_log(LP_WARN, "%s, version %s, resurrected", cf->cf_name, numbuf); return (0); } else if ((cf->cf_cvstat == CVS_FST_CONFLICT) || (cf->cf_cvstat == CVS_FST_LOST) || (cf->cf_cvstat == CVS_FST_MODIFIED) || (cf->cf_cvstat == CVS_FST_UPTODATE)) { if (verbosity > 1) { rcsnum_tostr(cf->cf_lrev, numbuf, sizeof(numbuf)); cvs_log(LP_WARN, "%s already exists, with version number %s", cf->cf_name, numbuf); } return (0); } if (verbosity > 1) { cvs_log(LP_NOTICE, "scheduling file `%s' for addition", cf->cf_name); added++; } if (added != 0) { if (verbosity > 0) cvs_log(LP_NOTICE, "use '%s commit' to add %s " "permanently", __progname, (added == 1) ? "this file" : "these files"); return (0); } return (0); } /* * cvs_add_directory() * * Add a directory to the repository. * * Returns 0 on success, -1 on failure. */ static int cvs_add_directory(CVSFILE *cf) { int l, nb; char *date, *repo, *tag; char entry[CVS_ENT_MAXLINELEN], fpath[MAXPATHLEN], rcsdir[MAXPATHLEN]; char msg[1024]; CVSENTRIES *entf; struct cvsroot *root; struct stat st; struct cvs_ent *ent; entf = (CVSENTRIES *)cf->cf_entry; root = CVS_DIR_ROOT(cf); repo = CVS_DIR_REPO(cf); if (strlcpy(fpath, cf->cf_name, sizeof(fpath)) >= sizeof(fpath)) return (-1); if (strchr(fpath, '/') != NULL) { cvs_log(LP_ERR, "directory %s not added; must be a direct sub-directory", fpath); return (-1); } /* Let's see if we have any per-directory tags first */ cvs_parse_tagfile(&tag, &date, &nb); /* XXX check for /CVS */ l = snprintf(rcsdir, sizeof(rcsdir), "%s/%s", root->cr_dir, repo); if (l == -1 || l >= (int)sizeof(rcsdir)) { errno = ENAMETOOLONG; cvs_log(LP_ERRNO, "%s", rcsdir); return (-1); } if ((stat(rcsdir, &st) == 0) && !(S_ISDIR(st.st_mode))) { cvs_log(LP_ERRNO, "%s is not a directory; %s not added", rcsdir, fpath); return (-1); } snprintf(msg, sizeof(msg), "Directory %s added to the repository", rcsdir); if (tag != NULL) { strlcat(msg, "\n--> Using per-directory sticky tag ", sizeof(msg)); strlcat(msg, tag, sizeof(msg)); } if (date != NULL) { strlcat(msg, "\n--> Using per-directory sticky date ", sizeof(msg)); strlcat(msg, date, sizeof(msg)); } strlcat(msg, "\n", sizeof(msg)); if (cvs_noexec == 0) { if (mkdir(rcsdir, 0777) == -1) { cvs_log(LP_ERRNO, "failed to create %s", rcsdir); return (-1); } } /* create CVS/ admin files */ if (cvs_noexec == 0) if (cvs_mkadmin(fpath, root->cr_str, repo, tag, date, nb) == -1) return (-1); /* XXX Build the Entries line. */ l = snprintf(entry, sizeof(entry), "D/%s////", fpath); if (l == -1 || l >= (int)sizeof(entry)) { errno = ENAMETOOLONG; cvs_log(LP_ERRNO, "%s", entry); return (-1); } if ((ent = cvs_ent_parse(entry)) == NULL) { cvs_log(LP_ERR, "failed to parse entry"); return (-1); } if (cvs_ent_add(entf, ent) < 0) { cvs_log(LP_ERR, "failed to add entry"); return (-1); } cvs_printf("%s", msg); return (0); } #if 0 static int cvs_add_build_entry(CVSFILE *cf) { int l; char entry[CVS_ENT_MAXLINELEN], path[MAXPATHLEN]; FILE *fp; CVSENTRIES *entf; struct cvs_ent *ent; entf = (CVSENTRIES *)cf->cf_entry; if (cvs_noexec == 1) return (0); /* Build the path to the ,t file. */ l = snprintf(path, sizeof(path), "%s/%s%s", CVS_PATH_CVSDIR, cf->cf_name, CVS_DESCR_FILE_EXT); if (l == -1 || l >= (int)sizeof(path)) { errno = ENAMETOOLONG; cvs_log(LP_ERRNO, "%s", path); return (CVS_EX_DATA); } fp = fopen(path, "w+"); if (fp == NULL) { cvs_log(LP_ERRNO, "failed to open `%s'", path); return (CVS_EX_FILE); } if (cvs_msg != NULL) { if (fputs(cvs_msg, fp) == EOF) { cvs_log(LP_ERRNO, "cannot write to `%s'", path); (void)fclose(fp); return (CVS_EX_FILE); } } (void)fclose(fp); /* XXX Build the Entries line. */ l = snprintf(entry, sizeof(entry), "/%s/0/Initial %s/%s/", cf->cf_name, cf->cf_name, kbuf); if (l == -1 || l >= (int)sizeof(entry)) { errno = ENAMETOOLONG; cvs_log(LP_ERRNO, "%s", entry); (void)cvs_unlink(path); return (CVS_EX_DATA); } if ((ent = cvs_ent_parse(entry)) == NULL) { cvs_log(LP_ERR, "failed to parse entry"); (void)cvs_unlink(path); return (CVS_EX_DATA); } if (cvs_ent_add(entf, ent) < 0) { cvs_log(LP_ERR, "failed to add entry"); (void)cvs_unlink(path); return (CVS_EX_DATA); } return (0); } #endif