Return to import.c CVS log

Up to [local] / src / usr.bin / cvs

set the default branch to 1.1.1 upon import, and remove a stray
cvs_connect() call

ok joris, xsa

/*	$OpenBSD: import.c,v 1.13 2005/04/25 16:29:41 jfb Exp $	*/
/*
 * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
 * 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 <sys/types.h>
#include <sys/queue.h>

#include <err.h>
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>

#include "log.h"
#include "file.h"
#include "cvs.h"
#include "proto.h"


#define CVS_IMPORT_DEFBRANCH    "1.1.1"

int cvs_import_options(char *, int, char **, int *);
int cvs_import_sendflags(struct cvsroot *);
int cvs_import_file(CVSFILE *, void *);

static RCSNUM *bnum;
static char *branch, *module, *vendor, *release;

struct cvs_cmd_info cvs_import = {
	cvs_import_options,
	cvs_import_sendflags,
	cvs_import_file,
	NULL, NULL,
	CF_RECURSE | CF_IGNORE | CF_NOSYMS,
	CVS_REQ_IMPORT,
	CVS_CMD_SENDDIR
};

int
cvs_import_options(char *opt, int argc, char **argv, int *arg)
{
	int ch;

	branch = CVS_IMPORT_DEFBRANCH;

	while ((ch = getopt(argc, argv, opt)) != -1) {
		switch (ch) {
		case 'b':
			branch = optarg;
			if ((bnum = rcsnum_parse(branch)) == NULL) {
				cvs_log(LP_ERR, "%s is not a numeric branch",
				    branch);
				return (CVS_EX_USAGE);
			}
			rcsnum_free(bnum);
			break;
		case 'd':
			break;
		case 'I':
			if (cvs_file_ignore(optarg) < 0) {
				cvs_log(LP_ERR, "failed to add `%s' to list "
				    "of ignore patterns", optarg);
				return (CVS_EX_USAGE);
			}
			break;
		case 'k':
			break;
		case 'm':
			cvs_msg = strdup(optarg);
			if (cvs_msg == NULL) {
				cvs_log(LP_ERRNO, "failed to copy message");
				return (CVS_EX_DATA);
			}
			break;
		default:
			return (CVS_EX_USAGE);
		}
	}

	argc -= optind;
	argv += optind;
	*arg = optind;

	if (argc > 4)
		return (CVS_EX_USAGE);

	module = argv[0];
	vendor = argv[1];
	release = argv[2];

	if ((cvs_msg == NULL) &&
	    (cvs_msg = cvs_logmsg_get(NULL, NULL, NULL, NULL)) == NULL)
		return (CVS_EX_DATA);

	return (0);
}

int
cvs_import_sendflags(struct cvsroot *root)
{
	if ((cvs_sendarg(root, "-b", 0) < 0) ||
	    (cvs_sendarg(root, branch, 0) < 0) ||
	    (cvs_logmsg_send(root, cvs_msg) < 0) ||
	    (cvs_sendarg(root, module, 0) < 0) ||
	    (cvs_sendarg(root, vendor, 0) < 0) ||
	    (cvs_sendarg(root, release, 0) < 0))
		return (CVS_EX_PROTO);

	return (0);
}

/*
 * cvs_import_file()
 *
 * Perform the import of a single file or directory.
 */
int
cvs_import_file(CVSFILE *cfp, void *arg)
{
	int ret, l;
	struct cvsroot *root;
	char fpath[MAXPATHLEN], repodir[MAXPATHLEN];
	char repo[MAXPATHLEN];

	root = CVS_DIR_ROOT(cfp);
	l = snprintf(repo, sizeof(repo), "%s/%s", root->cr_dir, module);
	if (l == -1 || l >= (int)sizeof(repo)) {
		errno = ENAMETOOLONG;
		cvs_log(LP_ERRNO, "%s", repo);
		return (-1);
	}

	cvs_file_getpath(cfp, fpath, sizeof(fpath));
	printf("Importing %s\n", fpath);

	if (cfp->cf_type == DT_DIR) {
		if (!strcmp(CVS_FILE_NAME(cfp), "."))
			strlcpy(repodir, repo, sizeof(repodir));
		else {
			l = snprintf(repodir, sizeof(repodir), "%s/%s",
			    repo, fpath);
			if (l == -1 || l >= (int)sizeof(repodir)) {
				errno = ENAMETOOLONG;
				cvs_log(LP_ERRNO, "%s", repodir);
				return (-1);
			}
		}
		if (root->cr_method != CVS_METHOD_LOCAL) {
			ret = cvs_sendreq(root, CVS_REQ_DIRECTORY, fpath);
			if (ret == 0)
				ret = cvs_sendln(root, repodir);
		} else {
			/* create the directory */
		}

		return (0);
	}

	if (root->cr_method != CVS_METHOD_LOCAL) {
		if (cvs_sendreq(root, CVS_REQ_MODIFIED, CVS_FILE_NAME(cfp)) < 0)
			return (CVS_EX_PROTO);
		if (cvs_sendfile(root, fpath) < 0)
			return (CVS_EX_PROTO);
	} else {
		/* local import */
	}

	return (0);
}