* svn-archive.c: Initial work on this (not nearly complete yet)

* svn-fast-export.c: Fix a potential segfault
* Makefile: add support for svn-archive

diff --git a/Makefile b/Makefile
index 6a84cd735849a109707aa7afbfdf428dfec993dd..baa438ea8d7112a1dda4588b3276056fe8b5c0fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 SVN = /usr/local/svn
-CFLAGS = -I/usr/include/apr-1.0 -I${SVN}/include/subversion-1 -pipe -g3 -std=c99
+CFLAGS = -I/usr/include/apr-1.0 -I${SVN}/include/subversion-1 -pipe -O2 -std=c99
 LDFLAGS = -L${SVN}/lib -lsvn_repos-1
 
+all: svn-fast-export svn-archive
+
 svn-fast-export: svn-fast-export.c
+svn-archive: svn-archive.c

diff --git a/svn-archive.c b/svn-archive.c
new file mode 100644 (file)
index 0000000..0a5efcc
--- /dev/null
+++ b/svn-archive.c
@@ -0,0 +1,190 @@
+/*
+ * svn-archive.c
+ * ----------
+ *  Walk through a given revision of a local Subversion repository and export 
+ *  all of the contents as a tarfile.
+ *
+ * Author: Chris Lee <clee@kde.org>
+ * License: MIT <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+#define _XOPEN_SOURCE
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+#include <apr_general.h>
+#include <apr_lib.h>
+#include <apr_getopt.h>
+
+#include <svn_types.h>
+#include <svn_pools.h>
+#include <svn_repos.h>
+
+#undef SVN_ERR
+#define SVN_ERR(expr) SVN_INT_ERR(expr)
+#define apr_sane_push(arr, contents) *(char **)apr_array_push(arr) = contents
+
+#define TRUNK "/trunk"
+
+time_t get_epoch(char *svn_date)
+{
+    struct tm tm = {0};
+    char *date = malloc(strlen(svn_date) * sizeof(char *));
+    strncpy(date, svn_date, strlen(svn_date) - 8);
+    strptime(date, "%Y-%m-%dT%H:%M:%S", &tm);
+    free(date);
+    return mktime(&tm);
+}
+
+int tar_header(char *path, char *node, size_t size, svn_boolean_t is_dir)
+{
+    char buf[512];
+    memset(buf, '\0', sizeof(buf));
+    strncpy(buf, node, strlen(node));
+    strncpy(buf+257, "ustar  ", 6);
+    strncpy(buf+265, "clee", 4);
+    strncpy(buf+297, "clee", 4);
+    strncpy(buf+156, (is_dir ? "5" : "0"), 1);
+    strncpy(buf+345, path, strlen(path));
+
+    fwrite(buf, sizeof(char), sizeof(buf), stdout);
+    return 0;
+}
+
+int dump_blob(svn_fs_root_t *root, char *prefix, char *path, char *node, apr_pool_t *pool)
+{
+    char           *full_path, buf[512];
+    apr_size_t     len;
+    svn_stream_t   *stream;
+    svn_filesize_t stream_length;
+
+    full_path = apr_psprintf(pool, "%s%s/%s", prefix, path, node);
+
+    SVN_ERR(svn_fs_file_length(&stream_length, root, full_path, pool));
+    SVN_ERR(svn_fs_file_contents(&stream, root, full_path, pool));
+
+    tar_header(path, node, stream_length, 0);
+
+    do {
+        len = sizeof(buf);
+        memset(buf, '\0', sizeof(buf));
+        SVN_ERR(svn_stream_read(stream, buf, &len));
+        fwrite(buf, sizeof(char), sizeof(buf), stdout);
+        fprintf(stderr, "len %d\n", len);
+    } while (len == sizeof(buf));
+
+    return 0;
+}
+
+int dump_tree(svn_fs_root_t *root, char *prefix, char *path, apr_pool_t *pool)
+{
+    const void       *key;
+    void             *val;
+    char             *node, *subpath, *full_path;
+
+    apr_pool_t       *subpool;
+    apr_hash_t       *dir_entries;
+    apr_hash_index_t *i;
+
+    svn_boolean_t    is_dir;
+
+    tar_header("", path, -1, 1);
+
+    SVN_ERR(svn_fs_dir_entries(&dir_entries, root, apr_psprintf(pool, "%s/%s", prefix, path), pool));
+
+    subpool = svn_pool_create(pool);
+
+    for (i = apr_hash_first(pool, dir_entries); i; i = apr_hash_next(i)) {
+        svn_pool_clear(subpool);
+        apr_hash_this(i, &key, NULL, &val);
+        node = (char *)key;
+
+        subpath = apr_psprintf(subpool, "%s/%s", path, node);
+        full_path = apr_psprintf(subpool, "%s%s", prefix, subpath);
+
+        svn_fs_is_dir(&is_dir, root, full_path, subpool);
+
+        fprintf(stderr, "path: %s\n", full_path);
+        if (is_dir) {
+            dump_tree(root, prefix, subpath, subpool);
+        } else {
+            dump_blob(root, prefix, path, node, subpool);
+        }
+    }
+
+    svn_pool_destroy(subpool);
+
+    return 0;
+}
+
+int crawl_revisions(char *repos_path, char *root_path)
+{
+    const void           *key;
+    void                 *val;
+    char                 *path, *file_change;
+ 
+    apr_pool_t           *pool;
+    apr_hash_index_t     *i;
+    apr_hash_t           *props;
+
+    svn_fs_t             *fs;
+    svn_repos_t          *repos;
+    svn_string_t         *author, *committer, *svndate, *svnlog;
+    svn_revnum_t         youngest_rev, export_rev;
+    svn_boolean_t        is_dir;
+    svn_fs_root_t        *root_obj;
+    svn_fs_path_change_t *change;
+
+    pool = svn_pool_create(NULL);
+
+    SVN_ERR(svn_repos_open(&repos, repos_path, pool));
+
+    fs = svn_repos_fs(repos);
+
+    SVN_ERR(svn_fs_initialize(pool));
+    SVN_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool));
+
+    export_rev = youngest_rev;
+
+    fprintf(stderr, "Exporting archive of r%ld... ", export_rev);
+
+    SVN_ERR(svn_fs_revision_root(&root_obj, fs, export_rev, pool));
+    SVN_ERR(svn_fs_revision_proplist(&props, fs, export_rev, pool));
+
+    svnlog  = apr_hash_get(props, "svn:log", APR_HASH_KEY_STRING);
+    svndate = apr_hash_get(props, "svn:date", APR_HASH_KEY_STRING);
+    author  = apr_hash_get(props, "svn:author", APR_HASH_KEY_STRING);
+
+    dump_tree(root_obj, root_path, "", pool);
+
+    fprintf(stderr, "done!\n");
+
+    return 0;
+}
+
+int main(int argc, char *argv[])
+{
+    apr_getopt_t *os;
+
+    if (argc < 2) {
+        fprintf(stderr, "usage: %s REPOS_PATH [prefix]\n", argv[0]);
+        return -1;
+    }
+
+    if (apr_initialize() != APR_SUCCESS) {
+        fprintf(stderr, "You lose at apr_initialize().\n");
+        return -1;
+    }
+
+    crawl_revisions(argv[1], (argc == 3 ? argv[2] : TRUNK));
+
+    apr_terminate();
+
+    return 0;
+}

diff --git a/svn-fast-export.c b/svn-fast-export.c
index 2cfb3ad73533968df992108f93b187a4fa30e87a..6c398d7e5cd830f8c8092643ecac45f33758f08f 100644 (file)
--- a/svn-fast-export.c
+++ b/svn-fast-export.c
@@ -129,7 +129,7 @@ int export_revision(svn_revnum_t rev, svn_repos_t *repo, svn_fs_t *fs, apr_pool_
     fprintf(stdout, "data %d\n", svnlog->len);
     fputs(svnlog->data, stdout);
     fprintf(stdout, "\n");
-    fprintf(stdout, apr_array_pstrcat(pool, file_changes, '\n'));
+    fputs(apr_array_pstrcat(pool, file_changes, '\n'), stdout);
     fprintf(stdout, "\n\n");
     fflush(stdout);