2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 static char *diff_cmd
= "diff -L 'a/%s' -L 'b/%s' -p -u - '%s'";
10 /* Help to copy the thing properly quoted for the shell safety.
11 * any single quote is replaced with '\'', and the caller is
12 * expected to enclose the result within a single quote pair.
15 * original sq_expand result
16 * name ==> name ==> 'name'
17 * a b ==> a b ==> 'a b'
18 * a'b ==> a'\''b ==> 'a'\''b'
20 * NOTE! The returned memory belongs to this function so
23 static char *sq_expand(char *src
)
25 static char *buf
= NULL
;
29 /* count bytes needed to store the quoted string. */
30 for (cnt
= 1, cp
= src
; *cp
; cnt
++, cp
++)
34 if (! (buf
= malloc(cnt
)))
37 while ((c
= *src
++)) {
41 cp
= strcpy(cp
, "'\\''");
49 static void show_differences(char *name
, char *label
, void *old_contents
,
50 unsigned long long old_size
)
53 char *name_sq
= sq_expand(name
);
54 char *label_sq
= (name
!= label
) ? sq_expand(label
) : name_sq
;
55 int cmd_size
= strlen(name_sq
) +
56 strlen(label_sq
) * 2 + strlen(diff_cmd
);
57 char *cmd
= malloc(cmd_size
);
60 snprintf(cmd
, cmd_size
, diff_cmd
, label_sq
, label_sq
, name_sq
);
63 fwrite(old_contents
, old_size
, 1, f
);
65 if (label_sq
!= name_sq
)
71 static void show_diff_empty(struct cache_entry
*ce
)
74 unsigned long int size
;
75 unsigned char type
[20];
77 old
= read_sha1_file(ce
->sha1
, type
, &size
);
79 error("unable to read blob object for %s (%s)", ce
->name
,
80 sha1_to_hex(ce
->sha1
));
83 show_differences("/dev/null", ce
->name
, old
, size
);
86 static const char *show_diff_usage
= "show-diff [-q] [-s] [-z] [paths...]";
88 static int matches_pathspec(struct cache_entry
*ce
, char **spec
, int cnt
)
91 int namelen
= ce_namelen(ce
);
92 for (i
= 0; i
< cnt
; i
++) {
93 int speclen
= strlen(spec
[i
]);
94 if (! strncmp(spec
[i
], ce
->name
, speclen
) &&
96 (ce
->name
[speclen
] == 0 ||
97 ce
->name
[speclen
] == '/'))
103 int main(int argc
, char **argv
)
106 int silent_on_nonexisting_files
= 0;
107 int machine_readable
= 0;
108 int entries
= read_cache();
111 while (1 < argc
&& argv
[1][0] == '-') {
112 if (!strcmp(argv
[1], "-s"))
113 silent_on_nonexisting_files
= silent
= 1;
114 else if (!strcmp(argv
[1], "-q"))
115 silent_on_nonexisting_files
= 1;
116 else if (!strcmp(argv
[1], "-z"))
117 machine_readable
= 1;
119 usage(show_diff_usage
);
123 /* At this point, if argc == 1, then we are doing everything.
124 * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
127 perror("read_cache");
130 for (i
= 0; i
< entries
; i
++) {
132 struct cache_entry
*ce
= active_cache
[i
];
139 ! matches_pathspec(ce
, argv
+1, argc
-1))
143 if (machine_readable
)
144 printf("U %s%c", ce
->name
, 0);
146 printf("%s: Unmerged\n",
148 while (i
< entries
&&
149 !strcmp(ce
->name
, active_cache
[i
]->name
))
151 i
--; /* compensate for loop control increments */
155 if (stat(ce
->name
, &st
) < 0) {
156 if (errno
== ENOENT
&& silent_on_nonexisting_files
)
158 if (machine_readable
)
159 printf("X %s%c", ce
->name
, 0);
161 printf("%s: %s\n", ce
->name
, strerror(errno
));
167 changed
= cache_match_stat(ce
, &st
);
170 if (!machine_readable
)
171 printf("%s: %s\n", ce
->name
, sha1_to_hex(ce
->sha1
));
173 printf("%s %s%c", sha1_to_hex(ce
->sha1
), ce
->name
, 0);
179 old
= read_sha1_file(ce
->sha1
, type
, &size
);
181 error("unable to read blob object for %s (%s)",
182 ce
->name
, sha1_to_hex(ce
->sha1
));
184 show_differences(ce
->name
, ce
->name
, old
, size
);