=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/cvs/update.c 2004/12/06 21:03:13 1.10 --- src/usr.bin/cvs/update.c 2004/12/07 17:10:56 1.11 *************** *** 1,16 **** ! /* $OpenBSD: update.c,v 1.10 2004/12/06 21:03:13 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau ! * 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 --- 1,16 ---- ! /* $OpenBSD: update.c,v 1.11 2004/12/07 17:10:56 tedu Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau ! * 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 *************** *** 21,27 **** * 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 --- 21,27 ---- * 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 *************** *** 45,59 **** int cvs_update_prune (CVSFILE *, void *); - - /* * cvs_update() * * Handle the `cvs update' command. * Returns 0 on success, or the appropriate exit code on error. */ - int cvs_update(int argc, char **argv) { --- 45,56 ---- *************** *** 114,120 **** * * Diff a single file. */ - int cvs_update_file(CVSFILE *cf, void *arg) { --- 111,116 ---- *************** *** 207,213 **** * * Prune all directories which contain no more files known to CVS. */ - int cvs_update_prune(CVSFILE *cf, void *arg) { --- 203,208 ----