File: [local] / src / usr.bin / cvs / add.c (download)
Revision 1.66, Thu Jan 11 02:35:55 2007 UTC (17 years, 5 months ago) by joris
Branch: MAIN
Changes since 1.65: +2 -1 lines
in a remote setup:
do not connect to the remote server until we are sure all the options
passed to the commands are valid.
noticed by xsa@
|
/* $OpenBSD: add.c,v 1.66 2007/01/11 02:35:55 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "includes.h"
#include "cvs.h"
#include "diff.h"
#include "log.h"
#include "remote.h"
extern char *__progname;
void cvs_add_local(struct cvs_file *);
void cvs_add_entry(struct cvs_file *);
static void add_directory(struct cvs_file *);
static void add_file(struct cvs_file *);
static void add_entry(struct cvs_file *);
char *logmsg;
struct cvs_cmd cvs_cmd_add = {
CVS_OP_ADD, 0, "add",
{ "ad", "new" },
"Add a new file or directory to the repository",
"[-m message] ...",
"m:",
NULL,
cvs_add
};
int
cvs_add(int argc, char **argv)
{
int ch;
int flags;
struct cvs_recursion cr;
flags = CR_REPO;
while ((ch = getopt(argc, argv, cvs_cmd_add.cmd_opts)) != -1) {
switch (ch) {
case 'm':
logmsg = xstrdup(optarg);
break;
default:
fatal("%s", cvs_cmd_add.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
if (argc == 0)
fatal("%s", cvs_cmd_add.cmd_synopsis);
cr.enterdir = NULL;
cr.leavedir = NULL;
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_connect_to_server();
cr.fileproc = cvs_client_sendfile;
if (logmsg != NULL)
cvs_client_send_request("Argument -m%s", logmsg);
} else {
cr.fileproc = cvs_add_local;
}
cr.flags = flags;
cvs_file_run(argc, argv, &cr);
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_send_files(argv, argc);
cvs_client_senddir(".");
cvs_client_send_request("add");
cvs_client_get_responses();
if (server_response == SERVER_OK) {
cr.fileproc = cvs_add_entry;
cvs_file_run(argc, argv, &cr);
}
}
return (0);
}
void
cvs_add_entry(struct cvs_file *cf)
{
int l;
char *entry;
CVSENTRIES *entlist;
if (cf->file_type == CVS_DIR) {
entry = xmalloc(CVS_ENT_MAXLINELEN);
l = snprintf(entry, CVS_ENT_MAXLINELEN,
"D/%s/////", cf->file_name);
if (l == -1 || l >= CVS_ENT_MAXLINELEN)
fatal("cvs_add_entry: overflow");
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
xfree(entry);
} else {
add_entry(cf);
}
}
void
cvs_add_local(struct cvs_file *cf)
{
cvs_log(LP_TRACE, "cvs_add_local(%s)", cf->file_path);
cvs_file_classify(cf, NULL, 0);
/* dont use `cvs add *' */
if (strcmp(cf->file_name, ".") == 0 ||
strcmp(cf->file_name, "..") == 0 ||
strcmp(cf->file_name, CVS_PATH_CVSDIR) == 0) {
if (verbosity > 1)
cvs_log(LP_ERR,
"cannot add special file `%s'; skipping",
cf->file_name);
return;
}
if (cf->file_type == CVS_DIR)
add_directory(cf);
else
add_file(cf);
}
static void
add_directory(struct cvs_file *cf)
{
int l, added, nb;
struct stat st;
CVSENTRIES *entlist;
char *date, *entry, msg[1024], *repo, *tag;
cvs_log(LP_TRACE, "add_directory(%s)", cf->file_path);
entry = xmalloc(MAXPATHLEN);
l = snprintf(entry, MAXPATHLEN, "%s%s", cf->file_rpath, RCS_FILE_EXT);
if (l == -1 || l >= MAXPATHLEN)
fatal("cvs_add_local: overflow");
added = 1;
if (stat(entry, &st) != -1) {
cvs_log(LP_NOTICE, "cannot add directory %s: "
"a file with that name already exists",
cf->file_path);
added = 0;
} else {
/* Let's see if we have any per-directory tags first. */
cvs_parse_tagfile(cf->file_wd, &tag, &date, &nb);
if (cvs_path_cat(cf->file_path, CVS_PATH_CVSDIR,
entry, MAXPATHLEN) >= MAXPATHLEN)
fatal("add_directory: truncation");
if (stat(entry, &st) != -1) {
if (!S_ISDIR(st.st_mode)) {
cvs_log(LP_ERR, "%s exists but is not "
"directory", entry);
} else {
cvs_log(LP_NOTICE, "%s already exists",
entry);
}
added = 0;
} else if (cvs_noexec != 1) {
if (mkdir(cf->file_rpath, 0755) == -1 &&
errno != EEXIST)
fatal("add_directory: %s: %s", cf->file_path,
strerror(errno));
repo = xmalloc(MAXPATHLEN);
cvs_get_repository_name(cf->file_wd, repo,
MAXPATHLEN);
if (cvs_path_cat(repo, cf->file_name, entry,
MAXPATHLEN) >= MAXPATHLEN)
fatal("add_directory: truncation");
cvs_mkadmin(cf->file_path, current_cvsroot->cr_dir,
entry, tag, date, nb);
xfree(repo);
xfree(entry);
entry = xmalloc(CVS_ENT_MAXLINELEN);
l = snprintf(entry, CVS_ENT_MAXLINELEN,
"D/%s/////", cf->file_name);
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
}
}
if (added == 1) {
snprintf(msg, sizeof(msg),
"Directory %s added to the repository", cf->file_rpath);
if (tag != NULL) {
(void)strlcat(msg,
"\n--> Using per-directory sticky tag ",
sizeof(msg));
(void)strlcat(msg, tag, sizeof(msg));
}
if (date != NULL) {
(void)strlcat(msg,
"\n--> Using per-directory sticky date ",
sizeof(msg));
(void)strlcat(msg, date, sizeof(msg));
}
cvs_printf("%s\n", msg);
if (tag != NULL)
xfree(tag);
if (date != NULL)
xfree(date);
}
cf->file_status = FILE_SKIP;
xfree(entry);
}
static void
add_file(struct cvs_file *cf)
{
BUF *b;
int added, stop;
char revbuf[16];
RCSNUM *head;
if (cf->file_rcs != NULL)
rcsnum_tostr(rcs_head_get(cf->file_rcs),
revbuf, sizeof(revbuf));
added = stop = 0;
switch (cf->file_status) {
case FILE_ADDED:
if (verbosity > 1)
cvs_log(LP_NOTICE, "%s has already been entered",
cf->file_path);
stop = 1;
break;
case FILE_REMOVED:
if (cf->file_rcs == NULL) {
cvs_log(LP_NOTICE, "cannot resurrect %s; "
"RCS file removed by second party", cf->file_name);
} else {
add_entry(cf);
/* Restore the file. */
head = rcs_head_get(cf->file_rcs);
b = rcs_getrev(cf->file_rcs, head);
if (b == NULL)
fatal("cvs_add_local: failed to get HEAD");
cvs_checkout_file(cf, head, b, 0);
cvs_printf("U %s\n", cf->file_path);
cvs_log(LP_NOTICE, "%s, version %s, resurrected",
cf->file_name, revbuf);
cf->file_status = FILE_UPTODATE;
}
stop = 1;
break;
case FILE_CONFLICT:
case FILE_LOST:
case FILE_MODIFIED:
case FILE_UPTODATE:
if (cf->file_rcs != NULL && cf->file_rcs->rf_dead == 0) {
cvs_log(LP_NOTICE, "%s already exists, with version "
"number %s", cf->file_path, revbuf);
stop = 1;
}
break;
case FILE_UNKNOWN:
if (cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1) {
cvs_log(LP_NOTICE, "re-adding file %s "
"(instead of dead revision %s)",
cf->file_path, revbuf);
} else {
cvs_log(LP_NOTICE, "scheduling file '%s' for addition",
cf->file_path);
}
added++;
break;
default:
break;
}
if (stop == 1)
return;
add_entry(cf);
if (added != 0) {
if (verbosity > 1)
cvs_log(LP_NOTICE, "use '%s commit' to add %s "
"permanently", __progname,
(added == 1) ? "this file" : "these files");
}
}
static void
add_entry(struct cvs_file *cf)
{
FILE *fp;
int l;
char *entry, *path, revbuf[16], tbuf[32];
CVSENTRIES *entlist;
if (cvs_noexec == 1)
return;
entry = xmalloc(CVS_ENT_MAXLINELEN);
if (cf->file_status == FILE_REMOVED) {
rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
ctime_r(&cf->file_ent->ce_mtime, tbuf);
if (tbuf[strlen(tbuf) - 1] == '\n')
tbuf[strlen(tbuf) - 1] = '\0';
/* Remove the '-' prefixing the version number. */
l = snprintf(entry, CVS_ENT_MAXLINELEN,
"/%s/%s/%s//", cf->file_name, revbuf, tbuf);
if (l == -1 || l >= CVS_ENT_MAXLINELEN)
fatal("add_entry: truncation");
} else {
if (logmsg != NULL) {
path = xmalloc(MAXPATHLEN);
l = snprintf(path, MAXPATHLEN, "%s/%s%s",
CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
if (l == -1 || l >= MAXPATHLEN)
fatal("add_entry: truncation");
if ((fp = fopen(path, "w+")) == NULL)
fatal("add_entry: fopen `%s': %s",
path, strerror(errno));
if (fputs(logmsg, fp) == EOF) {
(void)unlink(path);
fatal("add_entry: fputs `%s': %s",
path, strerror(errno));
}
(void)fclose(fp);
xfree(path);
}
l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/0/Initial %s//",
cf->file_name, cf->file_name);
if (l == -1 || l >= CVS_ENT_MAXLINELEN)
fatal("add_entry: truncation");
}
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
xfree(entry);
}