From owner-svn-src-user@FreeBSD.ORG Thu Oct 15 10:48:19 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0DC01065676; Thu, 15 Oct 2009 10:48:19 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9556E8FC12; Thu, 15 Oct 2009 10:48:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FAmJ8i071102; Thu, 15 Oct 2009 10:48:19 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FAmJGM071098; Thu, 15 Oct 2009 10:48:19 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200910151048.n9FAmJGM071098@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Thu, 15 Oct 2009 10:48:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198121 - user/des/svnsup/src/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2009 10:48:19 -0000 Author: des Date: Thu Oct 15 10:48:19 2009 New Revision: 198121 URL: http://svn.freebsd.org/changeset/base/198121 Log: Common code for creating and reading svnsup deltas. Added: user/des/svnsup/src/libsvnsup/ (props changed) user/des/svnsup/src/libsvnsup/Makefile.am (contents, props changed) user/des/svnsup/src/libsvnsup/svnsup.h (contents, props changed) user/des/svnsup/src/libsvnsup/svnsup_delta.c (contents, props changed) Added: user/des/svnsup/src/libsvnsup/Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/src/libsvnsup/Makefile.am Thu Oct 15 10:48:19 2009 (r198121) @@ -0,0 +1,9 @@ +# $Id$ + +lib_LIBRARIES = libsvnsup.a + +libsvnsup_a_SOURCES = \ + svnsup_delta.c + +noinst_HEADERS = \ + svnsup.h Added: user/des/svnsup/src/libsvnsup/svnsup.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/src/libsvnsup/svnsup.h Thu Oct 15 10:48:19 2009 (r198121) @@ -0,0 +1,47 @@ +/*- + * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav + * 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 + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + * + * $Id$ + */ + +#ifndef SVNSUP_H_INCLUDED +#define SVNSUP_H_INCLUDED + +typedef enum svnsup_err { + SVNSUP_ERR_NONE, + SVNSUP_ERR_MEMORY, + SVNSUP_ERR_UNKNOWN, + SVNSUP_ERR_MAX, +} svnsup_err_t; + +typedef struct svnsup_delta *svnsup_delta_t; + +int svnsup_delta_create(svnsup_delta_t *); +int svnsup_delta_close(svnsup_delta_t); + +int svnsup_delta_comment(svnsup_delta_t, const char *, ...); + +#endif Added: user/des/svnsup/src/libsvnsup/svnsup_delta.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/src/libsvnsup/svnsup_delta.c Thu Oct 15 10:48:19 2009 (r198121) @@ -0,0 +1,87 @@ +/*- + * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav + * 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 + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + * + * $Id$ + */ + +#include +#include +#include +#include + +#include "svnsup.h" + +struct svnsup_delta { + FILE *f; + int started:1; +}; + +int +svnsup_delta_create(svnsup_delta_t *sdp) +{ + svnsup_delta_t sd; + + if ((sd = calloc(1, sizeof *sd)) == NULL) + return (SVNSUP_ERR_MEMORY); + sd->f = stdout; + *sdp = sd; + return (SVNSUP_ERR_NONE); +} + +int +svnsup_delta_close(svnsup_delta_t sd) +{ + + free(sd); + return (SVNSUP_ERR_NONE); +} + +int +svnsup_delta_comment(svnsup_delta_t sd, const char *fmt, ...) +{ + va_list ap; + char *commentbuf, *p; + int len; + + va_start(ap, fmt); + len = vasprintf(&commentbuf, fmt, ap); + va_end(ap); + if (commentbuf == NULL) + return (SVNSUP_ERR_MEMORY); + p = commentbuf; + while (*p != '\0') { + fputs("# ", sd->f); + while (*p != '\0' && *p != '\n') { + putc(isprint(*p) ? *p : ' ', sd->f); + ++p; + } + putc('\n', sd->f); + if (*p == '\n') + ++p; + } + free(commentbuf); + return (SVNSUP_ERR_NONE); +}