diff options
Diffstat (limited to 'subversion/libsvn_diff/diff_file.c')
| -rw-r--r-- | subversion/libsvn_diff/diff_file.c | 70 |
1 files changed, 48 insertions, 22 deletions
diff --git a/subversion/libsvn_diff/diff_file.c b/subversion/libsvn_diff/diff_file.c index f54522e7c9c6e..d0182c8b35552 100644 --- a/subversion/libsvn_diff/diff_file.c +++ b/subversion/libsvn_diff/diff_file.c @@ -777,7 +777,6 @@ datasources_open(void *baton, { svn_diff__file_baton_t *file_baton = baton; struct file_info files[4]; - apr_finfo_t finfo[4]; apr_off_t length[4]; #ifndef SVN_DISABLE_PREFIX_SUFFIX_SCANNING svn_boolean_t reached_one_eof; @@ -792,14 +791,14 @@ datasources_open(void *baton, /* Open datasources and read first chunk */ for (i = 0; i < datasources_len; i++) { + svn_filesize_t filesize; struct file_info *file = &file_baton->files[datasource_to_index(datasources[i])]; SVN_ERR(svn_io_file_open(&file->file, file->path, APR_READ, APR_OS_DEFAULT, file_baton->pool)); - SVN_ERR(svn_io_file_info_get(&finfo[i], APR_FINFO_SIZE, - file->file, file_baton->pool)); - file->size = finfo[i].size; - length[i] = finfo[i].size > CHUNK_SIZE ? CHUNK_SIZE : finfo[i].size; + SVN_ERR(svn_io_file_size_get(&filesize, file->file, file_baton->pool)); + file->size = filesize; + length[i] = filesize > CHUNK_SIZE ? CHUNK_SIZE : filesize; file->buffer = apr_palloc(file_baton->pool, (apr_size_t) length[i]); SVN_ERR(read_chunk(file->file, file->buffer, length[i], 0, file_baton->pool)); @@ -1243,17 +1242,20 @@ svn_diff_file_options_parse(svn_diff_file_options_t *options, { apr_getopt_t *os; struct opt_parsing_error_baton_t opt_parsing_error_baton; - /* Make room for each option (starting at index 1) plus trailing NULL. */ - const char **argv = apr_palloc(pool, sizeof(char*) * (args->nelts + 2)); + apr_array_header_t *argv; opt_parsing_error_baton.err = NULL; opt_parsing_error_baton.pool = pool; - argv[0] = ""; - memcpy(argv + 1, args->elts, sizeof(char*) * args->nelts); - argv[args->nelts + 1] = NULL; + /* Make room for each option (starting at index 1) plus trailing NULL. */ + argv = apr_array_make(pool, args->nelts + 2, sizeof(char*)); + APR_ARRAY_PUSH(argv, const char *) = ""; + apr_array_cat(argv, args); + APR_ARRAY_PUSH(argv, const char *) = NULL; - apr_getopt_init(&os, pool, args->nelts + 1, argv); + apr_getopt_init(&os, pool, + argv->nelts - 1 /* Exclude trailing NULL */, + (const char *const *) argv->elts); /* Capture any error message from apr_getopt_long(). This will typically * say which option is wrong, which we would not otherwise know. */ @@ -1417,6 +1419,10 @@ typedef struct svn_diff__file_output_baton_t int context_size; + /* Cancel handler */ + svn_cancel_func_t cancel_func; + void *cancel_baton; + apr_pool_t *pool; } svn_diff__file_output_baton_t; @@ -1598,10 +1604,15 @@ static APR_INLINE svn_error_t * output_unified_diff_range(svn_diff__file_output_baton_t *output_baton, int source, svn_diff__file_output_unified_type_e type, - apr_off_t until) + apr_off_t until, + svn_cancel_func_t cancel_func, + void *cancel_baton) { while (output_baton->current_line[source] < until) { + if (cancel_func) + SVN_ERR(cancel_func(cancel_baton)); + SVN_ERR(output_unified_line(output_baton, type, source)); } return SVN_NO_ERROR; @@ -1627,7 +1638,8 @@ output_unified_flush_hunk(svn_diff__file_output_baton_t *baton) /* Add trailing context to the hunk */ SVN_ERR(output_unified_diff_range(baton, 0 /* original */, svn_diff__file_output_unified_context, - target_line)); + target_line, + baton->cancel_func, baton->cancel_baton)); old_start = baton->hunk_start[0]; new_start = baton->hunk_start[1]; @@ -1715,7 +1727,9 @@ output_unified_diff_modified(void *baton, /* Original: Output the context preceding the changed range */ SVN_ERR(output_unified_diff_range(output_baton, 0 /* original */, svn_diff__file_output_unified_context, - original_start)); + original_start, + output_baton->cancel_func, + output_baton->cancel_baton)); } } @@ -1723,7 +1737,9 @@ output_unified_diff_modified(void *baton, to display */ SVN_ERR(output_unified_diff_range(output_baton, 0 /* original */, svn_diff__file_output_unified_skip, - original_start - context_prefix_length)); + original_start - context_prefix_length, + output_baton->cancel_func, + output_baton->cancel_baton)); /* Note that the above skip stores data for the show_c_function support below */ @@ -1769,20 +1785,28 @@ output_unified_diff_modified(void *baton, /* Modified: Skip lines until we are at the start of the changed range */ SVN_ERR(output_unified_diff_range(output_baton, 1 /* modified */, svn_diff__file_output_unified_skip, - modified_start)); + modified_start, + output_baton->cancel_func, + output_baton->cancel_baton)); /* Original: Output the context preceding the changed range */ SVN_ERR(output_unified_diff_range(output_baton, 0 /* original */, svn_diff__file_output_unified_context, - original_start)); + original_start, + output_baton->cancel_func, + output_baton->cancel_baton)); /* Both: Output the changed range */ SVN_ERR(output_unified_diff_range(output_baton, 0 /* original */, svn_diff__file_output_unified_delete, - original_start + original_length)); + original_start + original_length, + output_baton->cancel_func, + output_baton->cancel_baton)); SVN_ERR(output_unified_diff_range(output_baton, 1 /* modified */, svn_diff__file_output_unified_insert, - modified_start + modified_length)); + modified_start + modified_length, + output_baton->cancel_func, + output_baton->cancel_baton)); return SVN_NO_ERROR; } @@ -1843,6 +1867,8 @@ svn_diff_file_output_unified4(svn_stream_t *output_stream, memset(&baton, 0, sizeof(baton)); baton.output_stream = output_stream; + baton.cancel_func = cancel_func; + baton.cancel_baton = cancel_baton; baton.pool = pool; baton.header_encoding = header_encoding; baton.path[0] = original_path; @@ -1956,7 +1982,7 @@ typedef struct context_saver_t { const char **data; /* const char *data[context_size] */ apr_size_t *len; /* apr_size_t len[context_size] */ apr_size_t next_slot; - apr_size_t total_written; + apr_ssize_t total_writes; } context_saver_t; @@ -1972,7 +1998,7 @@ context_saver_stream_write(void *baton, cs->data[cs->next_slot] = data; cs->len[cs->next_slot] = *len; cs->next_slot = (cs->next_slot + 1) % cs->context_size; - cs->total_written++; + cs->total_writes++; } return SVN_NO_ERROR; } @@ -2252,7 +2278,7 @@ output_conflict_with_context(svn_diff3__file_output_baton_t *btn, trailing context)? If so, flush it. */ if (btn->output_stream == btn->context_saver->stream) { - if (btn->context_saver->total_written > btn->context_size) + if (btn->context_saver->total_writes > btn->context_size) SVN_ERR(svn_stream_puts(btn->real_output_stream, "@@\n")); SVN_ERR(flush_context_saver(btn->context_saver, btn->real_output_stream)); } |