Skip to content

Commit

Permalink
vcs-svn: handle filenames with dq correctly
Browse files Browse the repository at this point in the history
Quote paths passed to fast-import so filenames with double quotes are
not misinterpreted.

One might imagine this could help with filenames with newlines, too,
but svn does not allow those.

Helped-by: David Barr <daivd.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  • Loading branch information
Jonathan Nieder committed Mar 7, 2011
1 parent e435811 commit 1ae469b
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions vcs-svn/fast_export.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ void fast_export_reset(void)

void fast_export_delete(uint32_t depth, const uint32_t *path)
{
putchar('D');
putchar(' ');
pool_print_seq(depth, path, '/', stdout);
putchar('\n');
printf("D \"");
pool_print_seq_q(depth, path, '/', stdout);
printf("\"\n");
}

static void fast_export_truncate(uint32_t depth, const uint32_t *path, uint32_t mode)
Expand All @@ -54,9 +53,9 @@ void fast_export_modify(uint32_t depth, const uint32_t *path, uint32_t mode,
fast_export_truncate(depth, path, mode);
return;
}
printf("M %06"PRIo32" %s ", mode, dataref);
pool_print_seq(depth, path, '/', stdout);
putchar('\n');
printf("M %06"PRIo32" %s \"", mode, dataref);
pool_print_seq_q(depth, path, '/', stdout);
printf("\"\n");
}

static char gitsvnline[MAX_GITSVN_LINE_LEN];
Expand Down Expand Up @@ -97,9 +96,9 @@ void fast_export_end_commit(uint32_t revision)
static void ls_from_rev(uint32_t rev, uint32_t depth, const uint32_t *path)
{
/* ls :5 path/to/old/file */
printf("ls :%"PRIu32" ", rev);
pool_print_seq(depth, path, '/', stdout);
putchar('\n');
printf("ls :%"PRIu32" \"", rev);
pool_print_seq_q(depth, path, '/', stdout);
printf("\"\n");
fflush(stdout);
}

Expand Down

0 comments on commit 1ae469b

Please sign in to comment.