/* $OpenBSD: ci.c,v 1.9 2005/10/08 15:26:47 niallo Exp $ */ /* * Copyright (c) 2005 Niall O'Higgins * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following cinditions * are met: * * 1. Redistributions of source cide must retain the above cipyright * notice, this list of cinditions 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 #include #include #include #include #include #include "log.h" #include "rcs.h" #include "diff.h" #include "rcsprog.h" extern char *__progname; #define LOCK_LOCK 1 #define LOCK_UNLOCK 2 static char * checkin_diff_file(RCSFILE *, RCSNUM *, const char *); static char * checkin_getlogmsg(char *, char *, RCSNUM *); void checkin_usage(void) { fprintf(stderr, "usage: %s [-jlMNqu] [-d date | -r rev] [-m msg] [-k mode] " "file ...\n", __progname); } /* * checkin_main() * * Handler for the `ci' program. * Returns 0 on success, or >0 on error. */ /* Options: -r | -r[rev]: check in revision rev -l[rev]: ", but do co -l -u[rev]: ", but do co -u -f[rev]: force a deposit (check in?) -k[rev]: ? -q[rev]: quiet mode -i[rev]: initial check in, errors if RCS file already exists. -j[rev]: just checkin and do not initialize, errors if RCS file already exists. -I[rev]: user is prompted even if stdin is not a tty -d[date]: uses date for checkin date and time. -M[rev]: set modification time on any new working file to be that of the retrieved version. -mmsg: msg is the log message, don't start editor. log messages with #are comments. */ int checkin_main(int argc, char **argv) { int i, ch, dflag, flags, lkmode, interactive; mode_t fmode; RCSFILE *file; RCSNUM *frev; char fpath[MAXPATHLEN]; char *rcs_msg, *rev, *filec, *deltatext, *username; BUF *bp; flags = RCS_RDWR; file = NULL; rcs_msg = rev = NULL; fmode = lkmode = dflag = verbose = 0; interactive = 1; if ((username = getlogin()) == NULL) { cvs_log(LP_ERR, "failed to get username"); exit(1); } while ((ch = getopt(argc, argv, "j:lM:N:qud:r::m:k:V")) != -1) { switch (ch) { case 'h': (usage)(); exit(0); case 'm': rcs_msg = optarg; interactive = 0; break; case 'q': verbose = 0; break; case 'V': printf("%s\n", rcs_version); exit(0); case 'l': lkmode = LOCK_LOCK; break; case 'u': lkmode = LOCK_UNLOCK; break; default: (usage)(); exit(1); } } argc -= optind; argv += optind; if (argc == 0) { cvs_log(LP_ERR, "no input file"); (usage)(); exit(1); } for (i = 0; i < argc; i++) { if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0) continue; file = rcs_open(fpath, RCS_RDWR, fmode); if (file == NULL) { cvs_log(LP_ERR, "failed to open rcsfile '%s'", fpath); exit(1); } if (dflag) { /* XXX */ } /* * Load file contents */ if ((bp = cvs_buf_load(argv[i], BUF_AUTOEXT)) == NULL) { cvs_log(LP_ERR, "failed to load '%s'", argv[i]); exit(1); } if (rev == NULL) frev = file->rf_head; /* * If no log message specified, get it interactively. */ if (rcs_msg == NULL) rcs_msg = checkin_getlogmsg(fpath, argv[i], frev); if (cvs_buf_putc(bp, '\0') < 0) exit(1); filec = cvs_buf_release(bp); /* * Remove the lock */ if (rcs_lock_remove(file, frev) < 0) { if (rcs_errno != RCS_ERR_NOENT) cvs_log(LP_WARN, "failed to remove lock"); } /* * Get RCS patch */ if ((deltatext = checkin_diff_file(file, frev, argv[i])) == NULL) { cvs_log(LP_ERR, "failed to get diff"); exit(1); } /* * Current head revision gets the RCS patch as rd_text */ if (rcs_deltatext_set(file, file->rf_head, deltatext) == -1) { cvs_log(LP_ERR, "failed to set new rd_text for head rev"); exit (1); } /* * Now add our new revision */ if (rcs_rev_add(file, RCS_HEAD_REV, rcs_msg, -1) != 0) { cvs_log(LP_ERR, "failed to add new revision"); exit(1); } /* * New head revision has to contain entire file; */ if (rcs_deltatext_set(file, frev, filec) == -1) { cvs_log(LP_ERR, "failed to set new head revision"); exit(1); } free(deltatext); free(filec); (void)unlink(argv[i]); /* * Do checkout if -u or -l are specified. */ if (lkmode != 0) { mode_t mode = 0; if ((bp = rcs_getrev(file, frev)) == NULL) { cvs_log(LP_ERR, "cannot get revision"); goto err; } if (lkmode == LOCK_LOCK) { mode = 0644; if (rcs_lock_add(file, username, frev) < 0) { if (rcs_errno != RCS_ERR_DUPENT) cvs_log(LP_ERR, "failed to lock revision"); else cvs_log(LP_ERR, "you already have a lock"); } } else if (lkmode == LOCK_UNLOCK) { mode = 0444; } if (cvs_buf_write(bp, argv[i], mode) < 0) { cvs_log(LP_ERR, "failed to write revision to file"); } cvs_buf_free(bp); } err: /* File will NOW be synced */ rcs_close(file); if (interactive) { free(rcs_msg); rcs_msg = NULL; } } return (0); } static char * checkin_diff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename) { char path1[MAXPATHLEN], path2[MAXPATHLEN]; BUF *b1, *b2, *b3; char rbuf[64], *deltatext; rcsnum_tostr(rev, rbuf, sizeof(rbuf)); if ((b1 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) { cvs_log(LP_ERR, "failed to load file: '%s'", filename); return (NULL); } if ((b2 = rcs_getrev(rfp, rev)) == NULL) { cvs_log(LP_ERR, "failed to load revision"); cvs_buf_free(b1); return (NULL); } if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL) { cvs_log(LP_ERR, "failed to allocated buffer for diff"); cvs_buf_free(b1); cvs_buf_free(b2); return (NULL); } strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1)); if (cvs_buf_write_stmp(b1, path1, 0600) == -1) { cvs_log(LP_ERRNO, "could not write temporary file"); cvs_buf_free(b1); cvs_buf_free(b2); return (NULL); } cvs_buf_free(b1); strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2)); if (cvs_buf_write_stmp(b2, path2, 0600) == -1) { cvs_buf_free(b2); (void)unlink(path1); return (NULL); } cvs_buf_free(b2); diff_format = D_RCSDIFF; cvs_diffreg(path1, path2, b3); (void)unlink(path1); (void)unlink(path2); cvs_buf_putc(b3, '\0'); deltatext = (char *)cvs_buf_release(b3); return (deltatext); } /* * Get log message from user interactively. */ static char * checkin_getlogmsg(char *rcsfile, char *workingfile, RCSNUM *rev) { char *rcs_msg, buf[128], nrev[16], prev[16]; BUF *logbuf; RCSNUM *tmprev; rcs_msg = NULL; tmprev = rcsnum_alloc(); rcsnum_cpy(rev, tmprev, 16); rcsnum_tostr(tmprev, prev, sizeof(prev)); rcsnum_tostr(rcsnum_inc(tmprev), nrev, sizeof(nrev)); rcsnum_free(tmprev); if ((logbuf = cvs_buf_alloc(64, BUF_AUTOEXT)) == NULL) { cvs_log(LP_ERR, "failed to allocate log buffer"); return (NULL); } cvs_printf("%s <-- %s\n", rcsfile, workingfile); cvs_printf("new revision: %s; previous revision: %s\n", nrev, prev); cvs_printf("enter log message, terminated with single " "'.' or end of file:\n"); cvs_printf(">> "); for (;;) { fgets(buf, (int)sizeof(buf), stdin); if (feof(stdin) || ferror(stdin) || buf[0] == '.') break; cvs_buf_append(logbuf, buf, strlen(buf)); cvs_printf(">> "); } cvs_buf_putc(logbuf, '\0'); rcs_msg = (char *)cvs_buf_release(logbuf); return (rcs_msg); }