undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: use large integers for diffstat calculations

Browse Source 
The diffstat "added" and "changed" fields generally store
line counts; however, for binary files, they store file
sizes. Since we store and print these values as ints, a
diffstat on a file larger than 2G can show a negative size.
Instead, let's use uintmax_t, which should be at least 64
bits on modern platforms.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2010-04-17 13:41:08 -04:00 committed by Junio C Hamano
parent 902f235378
commit 0974c117ff
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -942,7 +942,7 @@ struct diffstat_t {
unsigned is_unmerged:1; unsigned is_unmerged:1;
unsigned is_binary:1; unsigned is_binary:1;
unsigned is_renamed:1; unsigned is_renamed:1;
unsigned int added, deleted; uintmax_t added, deleted;
} **files; } **files;
}; };
@ -1034,7 +1034,7 @@ static void fill_print_name(struct diffstat_file *file)
static void show_stats(struct diffstat_t *data, struct diff_options *options) static void show_stats(struct diffstat_t *data, struct diff_options *options)
{ {
int i, len, add, del, adds = 0, dels = 0; int i, len, add, del, adds = 0, dels = 0;
int max_change = 0, max_len = 0; uintmax_t max_change = 0, max_len = 0;
int total_files = data->nr; int total_files = data->nr;
int width, name_width; int width, name_width;
const char *reset, *set, *add_c, *del_c; const char *reset, *set, *add_c, *del_c;
@ -1063,7 +1063,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
for (i = 0; i < data->nr; i++) { for (i = 0; i < data->nr; i++) {
struct diffstat_file *file = data->files[i]; struct diffstat_file *file = data->files[i];
int change = file->added + file->deleted; uintmax_t change = file->added + file->deleted;
fill_print_name(file); fill_print_name(file);
len = strlen(file->print_name); len = strlen(file->print_name);
if (max_len < len) if (max_len < len)
@ -1091,8 +1091,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
for (i = 0; i < data->nr; i++) { for (i = 0; i < data->nr; i++) {
const char *prefix = ""; const char *prefix = "";
char *name = data->files[i]->print_name; char *name = data->files[i]->print_name;
int added = data->files[i]->added; uintmax_t added = data->files[i]->added;
int deleted = data->files[i]->deleted; uintmax_t deleted = data->files[i]->deleted;
int name_len; int name_len;
/* /*
@ -1113,9 +1113,11 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
if (data->files[i]->is_binary) { if (data->files[i]->is_binary) {
show_name(options->file, prefix, name, len); show_name(options->file, prefix, name, len);
fprintf(options->file, " Bin "); fprintf(options->file, " Bin ");
fprintf(options->file, "%s%d%s", del_c, deleted, reset); fprintf(options->file, "%s%"PRIuMAX"%s",
del_c, deleted, reset);
fprintf(options->file, " -> "); fprintf(options->file, " -> ");
fprintf(options->file, "%s%d%s", add_c, added, reset); fprintf(options->file, "%s%"PRIuMAX"%s",
add_c, added, reset);
fprintf(options->file, " bytes"); fprintf(options->file, " bytes");
fprintf(options->file, "\n"); fprintf(options->file, "\n");
continue; continue;
@ -1144,7 +1146,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
del = scale_linear(del, width, max_change); del = scale_linear(del, width, max_change);
} }
show_name(options->file, prefix, name, len); show_name(options->file, prefix, name, len);
fprintf(options->file, "%5d%s", added + deleted, fprintf(options->file, "%5"PRIuMAX"%s", added + deleted,
added + deleted ? " " : ""); added + deleted ? " " : "");
show_graph(options->file, '+', add, add_c, reset); show_graph(options->file, '+', add, add_c, reset);
show_graph(options->file, '-', del, del_c, reset); show_graph(options->file, '-', del, del_c, reset);
@ -1194,7 +1196,8 @@ static void show_numstat(struct diffstat_t *data, struct diff_options *options)
fprintf(options->file, "-\t-\t"); fprintf(options->file, "-\t-\t");
else else
fprintf(options->file, fprintf(options->file,
"%d\t%d\t", file->added, file->deleted); "%"PRIuMAX"\t%"PRIuMAX"\t",
file->added, file->deleted);
if (options->line_termination) { if (options->line_termination) {
fill_print_name(file); fill_print_name(file);
if (!file->is_renamed) if (!file->is_renamed)