mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs-svn: handle log message with embedded NUL

Browse Source 
Pass the log message by strbuf instead of as a C-style string and use
fwrite instead of printf to write it to fast-import so embedded '\0'
bytes can be preserved.

Currently "git log" doesn't show the embedded NULs but "git cat-file
commit" can.

While at it, stop including system headers from repo_tree.h.  git
source files need to include git-compat-util.h (or cache.h or
builtin.h) sooner to ensure the appropriate feature test macros are
defined.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jonathan Nieder
2011-03-26 00:49:37 -05:00
parent 4c3169b03e
commit 195b7ca6f2
6 changed files with 94 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vcs-svn/fast_export.c
View File

@ -31,12 +31,14 @@ void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
}
static char gitsvnline[MAX_GITSVN_LINE_LEN];
void fast_export_commit(uint32_t revision, const char *author, char *log,
void fast_export_commit(uint32_t revision, const char *author,
const struct strbuf *log,
const char *uuid, const char *url,
unsigned long timestamp)
{
static const struct strbuf empty = STRBUF_INIT;
if (!log)
log = "";
log = &empty;
if (*uuid && *url) {
snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
@ -49,9 +51,9 @@ void fast_export_commit(uint32_t revision, const char *author, char *log,
*author ? author : "nobody",
*author ? author : "nobody",
*uuid ? uuid : "local", timestamp);
printf("data %"PRIu32"\n%s%s\n",
(uint32_t) (strlen(log) + strlen(gitsvnline)),
log, gitsvnline);
printf("data %"PRIuMAX"\n", log->len + strlen(gitsvnline));
fwrite(log->buf, log->len, 1, stdout);
printf("%s\n", gitsvnline);
if (!first_commit_done) {
if (revision > 1)
printf("from refs/heads/master^0\n");

7
vcs-svn/fast_export.h
View File

@ -2,13 +2,14 @@
#define FAST_EXPORT_H_
#include "line_buffer.h"
struct strbuf;
void fast_export_delete(uint32_t depth, uint32_t *path);
void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
uint32_t mark);
void fast_export_commit(uint32_t revision, const char *author, char *log,
const char *uuid, const char *url,
unsigned long timestamp);
void fast_export_commit(uint32_t revision, const char *author,
const struct strbuf *log, const char *uuid,
const char *url, unsigned long timestamp);
void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len,
struct line_buffer *input);

5
vcs-svn/repo_tree.c
View File

@ -278,8 +278,9 @@ void repo_diff(uint32_t r1, uint32_t r2)
repo_commit_root_dir(commit_pointer(r2)));
}
void repo_commit(uint32_t revision, const char *author, char *log,
const char *uuid, const char *url, unsigned long timestamp)
void repo_commit(uint32_t revision, const char *author,
const struct strbuf *log, const char *uuid, const char *url,
unsigned long timestamp)
{
fast_export_commit(revision, author, log, uuid, url, timestamp);
dent_commit();

4
vcs-svn/repo_tree.h
View File

@ -1,7 +1,7 @@
#ifndef REPO_TREE_H_
#define REPO_TREE_H_
#include "git-compat-util.h"
struct strbuf;
#define REPO_MODE_DIR 0040000
#define REPO_MODE_BLB 0100644
@ -18,7 +18,7 @@ uint32_t repo_read_path(const uint32_t *path);
uint32_t repo_read_mode(const uint32_t *path);
void repo_delete(uint32_t *path);
void repo_commit(uint32_t revision, const char *author,
char *log, const char *uuid, const char *url,
const struct strbuf *log, const char *uuid, const char *url,
long unsigned timestamp);
void repo_diff(uint32_t r1, uint32_t r2);
void repo_init(void);

2
vcs-svn/svndump.c
View File

@ -274,7 +274,7 @@ static void handle_revision(void)
{
if (rev_ctx.revision)
repo_commit(rev_ctx.revision, rev_ctx.author.buf,
rev_ctx.log.buf, dump_ctx.uuid.buf, dump_ctx.url.buf,
&rev_ctx.log, dump_ctx.uuid.buf, dump_ctx.url.buf,
rev_ctx.timestamp);
}