Date: Wed, 31 Mar 2010 22:11:19 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r206016 - in user/des/svnsup: bin/apply bin/distill include/svnsup lib/libsvnsup Message-ID: <201003312211.o2VMBJLh037552@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Mar 31 22:11:19 2010 New Revision: 206016 URL: http://svn.freebsd.org/changeset/base/206016 Log: More reorg Added: user/des/svnsup/include/svnsup/base64.h (contents, props changed) user/des/svnsup/include/svnsup/delta.h (contents, props changed) user/des/svnsup/include/svnsup/md5.h - copied unchanged from r206006, user/des/svnsup/lib/libsvnsup/svnsup_md5.h user/des/svnsup/include/svnsup/string.h (contents, props changed) Deleted: user/des/svnsup/lib/libsvnsup/svnsup_md5.h Modified: user/des/svnsup/bin/apply/Makefile.am user/des/svnsup/bin/distill/Makefile.am user/des/svnsup/bin/distill/distill.h user/des/svnsup/include/svnsup/Makefile.am user/des/svnsup/include/svnsup/svnsup.h user/des/svnsup/lib/libsvnsup/Makefile.am user/des/svnsup/lib/libsvnsup/svnsup_base64.c user/des/svnsup/lib/libsvnsup/svnsup_delta.c user/des/svnsup/lib/libsvnsup/svnsup_md5.c user/des/svnsup/lib/libsvnsup/svnsup_string.c Modified: user/des/svnsup/bin/apply/Makefile.am ============================================================================== --- user/des/svnsup/bin/apply/Makefile.am Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/bin/apply/Makefile.am Wed Mar 31 22:11:19 2010 (r206016) @@ -6,7 +6,7 @@ svnsup_apply_SOURCES = \ main.c svnsup_apply_CPPFLAGS = \ - -I$(top_srcdir)/include/svnsup + -I$(top_srcdir)/include svnsup_apply_LDADD = \ $(top_builddir)/lib/libsvnsup/libsvnsup.a Modified: user/des/svnsup/bin/distill/Makefile.am ============================================================================== --- user/des/svnsup/bin/distill/Makefile.am Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/bin/distill/Makefile.am Wed Mar 31 22:11:19 2010 (r206016) @@ -15,7 +15,7 @@ svnsup_distill_SOURCES = \ txdelta.c svnsup_distill_CPPFLAGS = \ - -I$(top_srcdir)/include/svnsup \ + -I$(top_srcdir)/include \ ${APR_1_CFLAGS} svnsup_distill_LDADD = \ Modified: user/des/svnsup/bin/distill/distill.h ============================================================================== --- user/des/svnsup/bin/distill/distill.h Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/bin/distill/distill.h Wed Mar 31 22:11:19 2010 (r206016) @@ -43,7 +43,7 @@ #include <subversion-1/svn_path.h> #include <subversion-1/svn_ra.h> -#include "svnsup.h" +#include "svnsup/svnsup.h" extern int debug; extern int verbose; Modified: user/des/svnsup/include/svnsup/Makefile.am ============================================================================== --- user/des/svnsup/include/svnsup/Makefile.am Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/include/svnsup/Makefile.am Wed Mar 31 22:11:19 2010 (r206016) @@ -1 +1,8 @@ # $Id$ + +noinst_HEADERS = \ + base64.h \ + delta.h \ + md5.h \ + string.h \ + svnsup.h Added: user/des/svnsup/include/svnsup/base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/include/svnsup/base64.h Wed Mar 31 22:11:19 2010 (r206016) @@ -0,0 +1,40 @@ +/*- + * 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_BASE64_H_INCLUDED +#define SVNSUP_BASE64_H_INCLUDED + +size_t svnsup_base64_encode(char *, const unsigned char *, size_t); +size_t svnsup_base64_decode(unsigned char *, const char *, size_t); +#ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ +size_t svnsup_base64_fencode(FILE *, const unsigned char *, size_t); +/* no fdecode yet */ +#endif + +#endif Added: user/des/svnsup/include/svnsup/delta.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/include/svnsup/delta.h Wed Mar 31 22:11:19 2010 (r206016) @@ -0,0 +1,61 @@ +/*- + * 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_DELTA_H_INCLUDED +#define SVNSUP_DELTA_H_INCLUDED + +typedef struct svnsup_delta *svnsup_delta_t; +typedef struct svnsup_delta_file *svnsup_delta_file_t; + +int svnsup_create_delta(svnsup_delta_t *); +int svnsup_close_delta(svnsup_delta_t); + +int svnsup_delta_root(svnsup_delta_t, const char *); +int svnsup_delta_uuid(svnsup_delta_t, const char *); +int svnsup_delta_path(svnsup_delta_t, const char *); +int svnsup_delta_comment(svnsup_delta_t, const char *, ...); +int svnsup_delta_meta(svnsup_delta_t, const char *, const char *, ...); +int svnsup_delta_create_directory(svnsup_delta_t, const char *); +int svnsup_delta_remove(svnsup_delta_t, const char *); +int svnsup_delta_text(svnsup_delta_t, const char *, size_t, + unsigned int *); + +int svnsup_delta_create_file(svnsup_delta_t, svnsup_delta_file_t *, + const char *); +int svnsup_delta_open_file(svnsup_delta_t, svnsup_delta_file_t *, + const char *); +int svnsup_delta_file_checksum(svnsup_delta_file_t, const char *); +int svnsup_delta_file_text(svnsup_delta_file_t, const char *, size_t, + unsigned int *); +int svnsup_delta_file_copy(svnsup_delta_file_t, off_t, size_t); +int svnsup_delta_file_repeat(svnsup_delta_file_t, off_t, size_t); +int svnsup_delta_file_insert(svnsup_delta_file_t, unsigned int, off_t, size_t); +int svnsup_delta_close_file(svnsup_delta_file_t, const char *); + +#endif Copied: user/des/svnsup/include/svnsup/md5.h (from r206006, user/des/svnsup/lib/libsvnsup/svnsup_md5.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/include/svnsup/md5.h Wed Mar 31 22:11:19 2010 (r206016, copy of r206006, user/des/svnsup/lib/libsvnsup/svnsup_md5.h) @@ -0,0 +1,40 @@ +/*- + * 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_MD5_H_INCLUDED +#define SVNSUP_MD5_H_INCLUDED + +typedef struct svnsup_md5 { + unsigned char md5[16]; +} svnsup_md5; + +void md5s2b(const char *, svnsup_md5 *); +void md5b2s(const svnsup_md5 *, char *); + +#endif Added: user/des/svnsup/include/svnsup/string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/include/svnsup/string.h Wed Mar 31 22:11:19 2010 (r206016) @@ -0,0 +1,43 @@ +/*- + * 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_STRING_H_INCLUDED +#define SVNSUP_STRING_H_INCLUDED + +int svnsup_string_is_safe(const char *); +int svnsup_buf_is_safe(const unsigned char *, size_t); +char *svnsup_string_encode(const char *); +char *svnsup_buf_encode(const unsigned char *, size_t); + +#ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ +size_t svnsup_string_fencode(FILE *, const char *); +size_t svnsup_buf_fencode(FILE *, const unsigned char *, size_t); +#endif + +#endif Modified: user/des/svnsup/include/svnsup/svnsup.h ============================================================================== --- user/des/svnsup/include/svnsup/svnsup.h Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/include/svnsup/svnsup.h Wed Mar 31 22:11:19 2010 (r206016) @@ -27,68 +27,13 @@ * $Id$ */ -#ifndef SVNSUP_H_INCLUDED -#define SVNSUP_H_INCLUDED +#ifndef SVNSUP_SVNSUP_H_INCLUDED +#define SVNSUP_SVNSUP_H_INCLUDED -typedef enum svnsup_err { - SVNSUP_ERR_NONE, - SVNSUP_ERR_MEMORY, - SVNSUP_ERR_UNKNOWN, - SVNSUP_ERR_MAX, -} svnsup_err_t; - -/* - * svnsup_delta.c - */ -typedef struct svnsup_delta *svnsup_delta_t; -typedef struct svnsup_delta_file *svnsup_delta_file_t; - -int svnsup_create_delta(svnsup_delta_t *); -int svnsup_close_delta(svnsup_delta_t); - -int svnsup_delta_root(svnsup_delta_t, const char *); -int svnsup_delta_uuid(svnsup_delta_t, const char *); -int svnsup_delta_path(svnsup_delta_t, const char *); -int svnsup_delta_comment(svnsup_delta_t, const char *, ...); -int svnsup_delta_meta(svnsup_delta_t, const char *, const char *, ...); -int svnsup_delta_create_directory(svnsup_delta_t, const char *); -int svnsup_delta_remove(svnsup_delta_t, const char *); -int svnsup_delta_text(svnsup_delta_t, const char *, size_t, - unsigned int *); - -int svnsup_delta_create_file(svnsup_delta_t, svnsup_delta_file_t *, - const char *); -int svnsup_delta_open_file(svnsup_delta_t, svnsup_delta_file_t *, - const char *); -int svnsup_delta_file_checksum(svnsup_delta_file_t, const char *); -int svnsup_delta_file_text(svnsup_delta_file_t, const char *, size_t, - unsigned int *); -int svnsup_delta_file_copy(svnsup_delta_file_t, off_t, size_t); -int svnsup_delta_file_repeat(svnsup_delta_file_t, off_t, size_t); -int svnsup_delta_file_insert(svnsup_delta_file_t, unsigned int, off_t, size_t); -int svnsup_delta_close_file(svnsup_delta_file_t, const char *); - -/* - * svnsup_string.c - */ -int svnsup_string_is_safe(const char *); -int svnsup_buf_is_safe(const unsigned char *, size_t); -char *svnsup_string_encode(const char *); -char *svnsup_buf_encode(const unsigned char *, size_t); - -#ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ -size_t svnsup_string_fencode(FILE *, const char *); -size_t svnsup_buf_fencode(FILE *, const unsigned char *, size_t); -#endif - -/* - * svnsup_base64.c - */ -size_t svnsup_base64_encode(char *, const unsigned char *, size_t); -size_t svnsup_base64_decode(unsigned char *, const char *, size_t); -#ifdef FOPEN_MAX /* defined by stdio.h, cf. IEEE 1003.1 */ -size_t svnsup_base64_fencode(FILE *, const unsigned char *, size_t); -/* no fdecode yet */ -#endif +#include <svnsup/base64.h> +#include <svnsup/delta.h> +#include <svnsup/error.h> +#include <svnsup/md5.h> +#include <svnsup/string.h> #endif Modified: user/des/svnsup/lib/libsvnsup/Makefile.am ============================================================================== --- user/des/svnsup/lib/libsvnsup/Makefile.am Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/lib/libsvnsup/Makefile.am Wed Mar 31 22:11:19 2010 (r206016) @@ -8,8 +8,5 @@ libsvnsup_a_SOURCES = \ svnsup_md5.c \ svnsup_string.c -noinst_HEADERS = \ - svnsup_md5.h - libsvnsup_a_CPPFLAGS = \ - -I$(top_srcdir)/include/svnsup + -I$(top_srcdir)/include Modified: user/des/svnsup/lib/libsvnsup/svnsup_base64.c ============================================================================== --- user/des/svnsup/lib/libsvnsup/svnsup_base64.c Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/lib/libsvnsup/svnsup_base64.c Wed Mar 31 22:11:19 2010 (r206016) @@ -36,7 +36,7 @@ #include <assert.h> #include <stdio.h> -#include "svnsup.h" +#include <svnsup/base64.h> static const char b64enc[64] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', Modified: user/des/svnsup/lib/libsvnsup/svnsup_delta.c ============================================================================== --- user/des/svnsup/lib/libsvnsup/svnsup_delta.c Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/lib/libsvnsup/svnsup_delta.c Wed Mar 31 22:11:19 2010 (r206016) @@ -39,7 +39,9 @@ #include <stdlib.h> #include <string.h> -#include "svnsup.h" +#include <svnsup/delta.h> +#include <svnsup/error.h> +#include <svnsup/string.h> // XXX missing I/O error handling Modified: user/des/svnsup/lib/libsvnsup/svnsup_md5.c ============================================================================== --- user/des/svnsup/lib/libsvnsup/svnsup_md5.c Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/lib/libsvnsup/svnsup_md5.c Wed Mar 31 22:11:19 2010 (r206016) @@ -36,7 +36,7 @@ #include <assert.h> #include <ctype.h> -#include "svnsup_md5.h" +#include <svnsup/md5.h> // XXX error handling and documentation Modified: user/des/svnsup/lib/libsvnsup/svnsup_string.c ============================================================================== --- user/des/svnsup/lib/libsvnsup/svnsup_string.c Wed Mar 31 22:11:06 2010 (r206015) +++ user/des/svnsup/lib/libsvnsup/svnsup_string.c Wed Mar 31 22:11:19 2010 (r206016) @@ -38,7 +38,8 @@ #include <stdio.h> #include <string.h> -#include "svnsup.h" +#include <svnsup/base64.h> +#include <svnsup/string.h> /* * Safe to send as is
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003312211.o2VMBJLh037552>