734
int nr;
735
int alloc;
736
struct diffstat_file {
737
+ char *from_name;
738
char *name;
739
+ char *print_name;
740
unsigned is_unmerged:1;
741
unsigned is_binary:1;
742
unsigned is_renamed:1;
757
}
758
diffstat->files[diffstat->nr++] = x;
759
if (name_b) {
758
- x->name = pprint_rename(name_a, name_b);
760
+ x->from_name = xstrdup(name_a);
761
+ x->name = xstrdup(name_b);
762
x->is_renamed = 1;
763
}
761
- else
764
+ else {
765
+ x->from_name = NULL;
766
x->name = xstrdup(name_a);
767
+ }
768
return x;
769
}
770
808
printf("%s", reset);
809
}
810
811
+static void fill_print_name(struct diffstat_file *file)
812
+{
813
+ char *pname;
814
+
815
+ if (file->print_name)
816
+ return;
817
+
818
+ if (!file->is_renamed) {
819
+ struct strbuf buf;
820
+ strbuf_init(&buf, 0);
821
+ if (quote_c_style(file->name, &buf, NULL, 0)) {
822
+ pname = strbuf_detach(&buf, NULL);
823
+ } else {
824
+ pname = file->name;
825
+ strbuf_release(&buf);
826
+ }
827
+ } else {
828
+ pname = pprint_rename(file->from_name, file->name);
829
+ }
830
+ file->print_name = pname;
831
+}
832
+
833
static void show_stats(struct diffstat_t* data, struct diff_options *options)
834
{
835
int i, len, add, del, total, adds = 0, dels = 0;
863
for (i = 0; i < data->nr; i++) {
864
struct diffstat_file *file = data->files[i];
865
int change = file->added + file->deleted;
839
-
840
- if (!file->is_renamed) { /* renames are already quoted by pprint_rename */
841
- struct strbuf buf;
842
- strbuf_init(&buf, 0);
843
- if (quote_c_style(file->name, &buf, NULL, 0)) {
844
- free(file->name);
845
- file->name = strbuf_detach(&buf, NULL);
846
- } else {
847
- strbuf_release(&buf);
848
- }
849
- }
850
-
851
- len = strlen(file->name);
866
+ fill_print_name(file);
867
+ len = strlen(file->print_name);
868
if (max_len < len)
869
max_len = len;
870
889
890
for (i = 0; i < data->nr; i++) {
891
const char *prefix = "";
876
- char *name = data->files[i]->name;
892
+ char *name = data->files[i]->print_name;
893
int added = data->files[i]->added;
894
int deleted = data->files[i]->deleted;
895
int name_len;
917
printf("%s%d%s", add_c, added, reset);
918
printf(" bytes");
919
printf("\n");
904
- goto free_diffstat_file;
920
+ continue;
921
}
922
else if (data->files[i]->is_unmerged) {
923
show_name(prefix, name, len, reset, set);
924
printf(" Unmerged\n");
909
- goto free_diffstat_file;
925
+ continue;
926
}
927
else if (!data->files[i]->is_renamed &&
928
(added + deleted == 0)) {
929
total_files--;
914
- goto free_diffstat_file;
930
+ continue;
931
}
932
933
/*
949
show_graph('+', add, add_c, reset);
950
show_graph('-', del, del_c, reset);
951
putchar('\n');
936
- free_diffstat_file:
937
- free(data->files[i]->name);
938
- free(data->files[i]);
952
}
940
- free(data->files);
953
printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
954
set, total_files, adds, dels, reset);
955
}
974
dels += deleted;
975
}
976
}
965
- free(data->files[i]->name);
966
- free(data->files[i]);
977
}
968
- free(data->files);
969
-
978
printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
979
total_files, adds, dels);
980
}
983
{
984
int i;
985
986
+ if (data->nr == 0)
987
+ return;
988
+
989
for (i = 0; i < data->nr; i++) {
990
struct diffstat_file *file = data->files[i];
991
993
printf("-\t-\t");
994
else
995
printf("%d\t%d\t", file->added, file->deleted);
985
- if (!file->is_renamed) {
986
- write_name_quoted(file->name, stdout, options->line_termination);
996
+ if (options->line_termination) {
997
+ fill_print_name(file);
998
+ if (!file->is_renamed)
999
+ write_name_quoted(file->name, stdout,
1000
+ options->line_termination);
1001
+ else {
1002
+ fputs(file->print_name, stdout);
1003
+ putchar(options->line_termination);
1004
+ }
1005
} else {
988
- fputs(file->name, stdout);
989
- putchar(options->line_termination);
1006
+ if (file->is_renamed) {
1007
+ putchar('\0');
1008
+ write_name_quoted(file->from_name, stdout, '\0');
1009
+ }
1010
+ write_name_quoted(file->name, stdout, '\0');
1011
}
1012
}
1013
}
1014
1015
+static void free_diffstat_info(struct diffstat_t *diffstat)
1016
+{
1017
+ int i;
1018
+ for (i = 0; i < diffstat->nr; i++) {
1019
+ struct diffstat_file *f = diffstat->files[i];
1020
+ if (f->name != f->print_name)
1021
+ free(f->print_name);
1022
+ free(f->name);
1023
+ free(f->from_name);
1024
+ free(f);
1025
+ }
1026
+ free(diffstat->files);
1027
+}
1028
+
1029
struct checkdiff_t {
1030
struct xdiff_emit_state xm;
1031
const char *filename;
2978
show_numstat(&diffstat, options);
2979
if (output_format & DIFF_FORMAT_DIFFSTAT)
2980
show_stats(&diffstat, options);
2946
- else if (output_format & DIFF_FORMAT_SHORTSTAT)
2981
+ if (output_format & DIFF_FORMAT_SHORTSTAT)
2982
show_shortstats(&diffstat);
2983
+ free_diffstat_info(&diffstat);
2984
separator++;
2985
}
2986