svn commit: r206006 - in user/des/svnsup: . bin bin/apply
bin/distill include include/svnsup lib lib/libsvnsup
src/apply src/distill src/libsvnsup
Dag-Erling Smorgrav
des at FreeBSD.org
Wed Mar 31 21:33:52 UTC 2010
Author: des
Date: Wed Mar 31 21:33:51 2010
New Revision: 206006
URL: http://svn.freebsd.org/changeset/base/206006
Log:
reorg
Added:
user/des/svnsup/bin/Makefile.am (contents, props changed)
user/des/svnsup/bin/apply/
- copied from r206003, user/des/svnsup/src/apply/
user/des/svnsup/bin/distill/
- copied from r206003, user/des/svnsup/src/distill/
user/des/svnsup/include/Makefile.am (contents, props changed)
user/des/svnsup/include/svnsup/Makefile.am (contents, props changed)
user/des/svnsup/include/svnsup/svnsup.h
- copied unchanged from r206003, user/des/svnsup/src/libsvnsup/svnsup.h
user/des/svnsup/lib/Makefile.am (contents, props changed)
user/des/svnsup/lib/libsvnsup/
- copied from r206003, user/des/svnsup/src/libsvnsup/
Directory Properties:
user/des/svnsup/bin/ (props changed)
user/des/svnsup/include/ (props changed)
user/des/svnsup/include/svnsup/ (props changed)
user/des/svnsup/lib/ (props changed)
Deleted:
user/des/svnsup/lib/libsvnsup/svnsup.h
user/des/svnsup/src/apply/
user/des/svnsup/src/distill/
user/des/svnsup/src/libsvnsup/
Modified:
user/des/svnsup/Makefile.am
user/des/svnsup/bin/apply/Makefile.am
user/des/svnsup/bin/distill/Makefile.am
user/des/svnsup/configure.ac
user/des/svnsup/lib/libsvnsup/Makefile.am
user/des/svnsup/lib/libsvnsup/svnsup_md5.c
Modified: user/des/svnsup/Makefile.am
==============================================================================
--- user/des/svnsup/Makefile.am Wed Mar 31 21:32:52 2010 (r206005)
+++ user/des/svnsup/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -2,4 +2,4 @@
DISTCHECK_CONFIGURE_FLAGS = CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS}
-SUBDIRS = src
+SUBDIRS = include lib bin
Added: user/des/svnsup/bin/Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/svnsup/bin/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -0,0 +1,11 @@
+# $Id$
+
+if ENABLE_DISTILL
+DISTILL_SUBDIR = distill
+endif
+
+if ENABLE_APPLY
+APPLY_SUBDIR = apply
+endif
+
+SUBDIRS = ${DISTILL_SUBDIR} ${APPLY_SUBDIR}
Modified: user/des/svnsup/bin/apply/Makefile.am
==============================================================================
--- user/des/svnsup/src/apply/Makefile.am Wed Mar 31 21:12:27 2010 (r206003)
+++ user/des/svnsup/bin/apply/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -6,7 +6,7 @@ svnsup_apply_SOURCES = \
main.c
svnsup_apply_CPPFLAGS = \
- -I$(top_builddir)/src/libsvnsup
+ -I$(top_srcdir)/include/svnsup
svnsup_apply_LDADD = \
- $(top_builddir)/src/libsvnsup/libsvnsup.a
+ $(top_builddir)/lib/libsvnsup/libsvnsup.a
Modified: user/des/svnsup/bin/distill/Makefile.am
==============================================================================
--- user/des/svnsup/src/distill/Makefile.am Wed Mar 31 21:12:27 2010 (r206003)
+++ user/des/svnsup/bin/distill/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -15,11 +15,11 @@ svnsup_distill_SOURCES = \
txdelta.c
svnsup_distill_CPPFLAGS = \
- -I$(top_builddir)/src/libsvnsup \
+ -I$(top_srcdir)/include/svnsup \
${APR_1_CFLAGS}
svnsup_distill_LDADD = \
- $(top_builddir)/src/libsvnsup/libsvnsup.a \
+ $(top_builddir)/lib/libsvnsup/libsvnsup.a \
${APR_1_LDADD} \
${SVN_DELTA_1_LIBS} \
${SVN_CLIENT_1_LIBS} \
Modified: user/des/svnsup/configure.ac
==============================================================================
--- user/des/svnsup/configure.ac Wed Mar 31 21:32:52 2010 (r206005)
+++ user/des/svnsup/configure.ac Wed Mar 31 21:33:51 2010 (r206006)
@@ -3,7 +3,7 @@
#
AC_PREREQ([2.59])
AC_INIT([svnsup], [1.0], [des at des.no])
-AC_CONFIG_SRCDIR([src/distill/distill.c])
+AC_CONFIG_SRCDIR([include/svnsup/svnsup.h])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
@@ -131,9 +131,12 @@ AS_IF([test x"$enable_distill" = x"yes"]
#
AC_CONFIG_FILES([
Makefile
- src/Makefile
- src/libsvnsup/Makefile
- src/distill/Makefile
- src/apply/Makefile
+ include/Makefile
+ include/svnsup/Makefile
+ lib/Makefile
+ lib/libsvnsup/Makefile
+ bin/Makefile
+ bin/apply/Makefile
+ bin/distill/Makefile
])
AC_OUTPUT
Added: user/des/svnsup/include/Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/svnsup/include/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -0,0 +1,3 @@
+# $Id$
+
+DISTILL_SUBDIR = svnsup
Added: user/des/svnsup/include/svnsup/Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/svnsup/include/svnsup/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -0,0 +1 @@
+# $Id$
Copied: user/des/svnsup/include/svnsup/svnsup.h (from r206003, user/des/svnsup/src/libsvnsup/svnsup.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/svnsup/include/svnsup/svnsup.h Wed Mar 31 21:33:51 2010 (r206006, copy of r206003, user/des/svnsup/src/libsvnsup/svnsup.h)
@@ -0,0 +1,94 @@
+/*-
+ * 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;
+
+/*
+ * 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
+
+#endif
Added: user/des/svnsup/lib/Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/svnsup/lib/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -0,0 +1,3 @@
+# $Id$
+
+SUBDIRS = libsvnsup
Modified: user/des/svnsup/lib/libsvnsup/Makefile.am
==============================================================================
--- user/des/svnsup/src/libsvnsup/Makefile.am Wed Mar 31 21:12:27 2010 (r206003)
+++ user/des/svnsup/lib/libsvnsup/Makefile.am Wed Mar 31 21:33:51 2010 (r206006)
@@ -9,5 +9,7 @@ libsvnsup_a_SOURCES = \
svnsup_string.c
noinst_HEADERS = \
- svnsup.h \
svnsup_md5.h
+
+libsvnsup_a_CPPFLAGS = \
+ -I$(top_srcdir)/include/svnsup
Modified: user/des/svnsup/lib/libsvnsup/svnsup_md5.c
==============================================================================
--- user/des/svnsup/src/libsvnsup/svnsup_md5.c Wed Mar 31 21:12:27 2010 (r206003)
+++ user/des/svnsup/lib/libsvnsup/svnsup_md5.c Wed Mar 31 21:33:51 2010 (r206006)
@@ -55,6 +55,7 @@ x2i(char x)
return (x - 'a');
}
assert(0);
+ return (0);
}
void
More information about the svn-src-user
mailing list