1 /* sdiff - side-by-side merge of file differences
3 Copyright (C) 1992-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013 Free
4 Software Foundation, Inc.
6 This file is part of GNU DIFF.
8 This program is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version.
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
18 You should have received a copy of the GNU General Public License
19 along with this program. If not, see <http://www.gnu.org/licenses/>. */
25 #include <unlocked-io.h>
31 #include <file-type.h>
34 #include <system-quote.h>
35 #include <version-etc.h>
38 /* The official name of this program (e.g., no 'g' prefix). */
39 #define PROGRAM_NAME "sdiff"
42 proper_name ("Thomas Lord")
44 /* Size of chunks read from files which must be parsed into lines. */
45 #define SDIFF_BUFSIZE ((size_t) 65536)
47 static char const *editor_program = DEFAULT_EDITOR_PROGRAM;
48 static char const **diffargv;
50 static char * volatile tmpname;
54 static pid_t volatile diffpid;
59 static void catchsig (int);
60 static bool edit (struct line_filter *, char const *, lin, lin, struct line_filter *, char const *, lin, lin, FILE *);
61 static bool interact (struct line_filter *, struct line_filter *, char const *, struct line_filter *, char const *, FILE *);
62 static void checksigs (void);
63 static void diffarg (char const *);
64 static void fatal (char const *) __attribute__((noreturn));
65 static void perror_fatal (char const *) __attribute__((noreturn));
66 static void trapsigs (void);
67 static void untrapsig (int);
69 static int const sigs[] = {
92 NUM_SIGS = sizeof sigs / sizeof *sigs,
93 handler_index_of_SIGINT = NUM_SIGS - 1
97 /* Prefer 'sigaction' if available, since 'signal' can lose signals. */
98 static struct sigaction initial_action[NUM_SIGS];
99 # define initial_handler(i) (initial_action[i].sa_handler)
100 static void signal_handler (int, void (*) (int));
102 static void (*initial_action[NUM_SIGS]) ();
103 # define initial_handler(i) (initial_action[i])
104 # define signal_handler(sig, handler) signal (sig, handler)
107 static bool diraccess (char const *);
108 static int temporary_file (void);
112 /* Name of output file if -o specified. */
113 static char const *output;
115 /* Do not print common lines. */
116 static bool suppress_common_lines;
118 /* Value for the long option that does not have single-letter equivalents. */
121 DIFF_PROGRAM_OPTION = CHAR_MAX + 1,
123 STRIP_TRAILING_CR_OPTION,
127 static struct option const longopts[] =
129 {"diff-program", 1, 0, DIFF_PROGRAM_OPTION},
130 {"expand-tabs", 0, 0, 't'},
131 {"help", 0, 0, HELP_OPTION},
132 {"ignore-all-space", 0, 0, 'W'}, /* swap W and w for historical reasons */
133 {"ignore-blank-lines", 0, 0, 'B'},
134 {"ignore-case", 0, 0, 'i'},
135 {"ignore-matching-lines", 1, 0, 'I'},
136 {"ignore-space-change", 0, 0, 'b'},
137 {"ignore-tab-expansion", 0, 0, 'E'},
138 {"ignore-trailing-space", 0, 0, 'Z'},
139 {"left-column", 0, 0, 'l'},
140 {"minimal", 0, 0, 'd'},
141 {"output", 1, 0, 'o'},
142 {"speed-large-files", 0, 0, 'H'},
143 {"strip-trailing-cr", 0, 0, STRIP_TRAILING_CR_OPTION},
144 {"suppress-common-lines", 0, 0, 's'},
145 {"tabsize", 1, 0, TABSIZE_OPTION},
147 {"version", 0, 0, 'v'},
148 {"width", 1, 0, 'w'},
152 static void try_help (char const *, char const *) __attribute__((noreturn));
154 try_help (char const *reason_msgid, char const *operand)
157 error (0, 0, _(reason_msgid), operand);
158 error (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."),
167 fatal ("write failed");
168 else if (fclose (stdout) != 0)
169 perror_fatal (_("standard output"));
172 static char const * const option_help_msgid[] = {
173 N_("-o, --output=FILE operate interactively, sending output to FILE"),
175 N_("-i, --ignore-case consider upper- and lower-case to be the same"),
176 N_("-E, --ignore-tab-expansion ignore changes due to tab expansion"),
177 N_("-Z, --ignore-trailing-space ignore white space at line end"),
178 N_("-b, --ignore-space-change ignore changes in the amount of white space"),
179 N_("-W, --ignore-all-space ignore all white space"),
180 N_("-B, --ignore-blank-lines ignore changes whose lines are all blank"),
181 N_("-I, --ignore-matching-lines=RE ignore changes all whose lines match RE"),
182 N_(" --strip-trailing-cr strip trailing carriage return on input"),
183 N_("-a, --text treat all files as text"),
185 N_("-w, --width=NUM output at most NUM (default 130) print columns"),
186 N_("-l, --left-column output only the left column of common lines"),
187 N_("-s, --suppress-common-lines do not output common lines"),
189 N_("-t, --expand-tabs expand tabs to spaces in output"),
190 N_(" --tabsize=NUM tab stops at every NUM (default 8) print columns"),
192 N_("-d, --minimal try hard to find a smaller set of changes"),
193 N_("-H, --speed-large-files assume large files, many scattered small changes"),
194 N_(" --diff-program=PROGRAM use PROGRAM to compare files"),
196 N_(" --help display this help and exit"),
197 N_("-v, --version output version information and exit"),
204 char const * const *p;
206 printf (_("Usage: %s [OPTION]... FILE1 FILE2\n"), program_name);
208 _("Side-by-side merge of differences between FILE1 and FILE2."));
211 Mandatory arguments to long options are mandatory for short options too.\n\
213 for (p = option_help_msgid; *p; p++)
215 printf (" %s\n", _(*p));
218 printf ("\n%s\n%s\n",
219 _("If a FILE is '-', read standard input."),
220 _("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."));
221 emit_bug_reporting_address ();
224 /* Clean up after a signal or other failure. This function is
225 async-signal-safe. */
227 cleanup (int signo __attribute__((unused)))
229 #if HAVE_WORKING_FORK
231 kill (diffpid, SIGPIPE);
237 static void exiterr (void) __attribute__((noreturn));
248 fatal (char const *msgid)
250 error (0, 0, "%s", _(msgid));
255 perror_fatal (char const *msg)
259 error (0, e, "%s", msg);
264 check_child_status (int werrno, int wstatus, int max_ok_status,
265 char const *subsidiary_program)
267 int status = (! werrno && WIFEXITED (wstatus)
268 ? WEXITSTATUS (wstatus)
271 if (max_ok_status < status)
275 ? "subsidiary program '%s' could not be invoked"
277 ? "subsidiary program '%s' not found"
279 ? "subsidiary program '%s' failed"
280 : "subsidiary program '%s' failed (exit status %d)"),
281 subsidiary_program, status);
287 ck_fopen (char const *fname, char const *type)
289 FILE *r = fopen (fname, type);
291 perror_fatal (fname);
299 perror_fatal ("fclose");
303 ck_fread (char *buf, size_t size, FILE *f)
305 size_t r = fread (buf, sizeof (char), size, f);
306 if (r == 0 && ferror (f))
307 perror_fatal (_("read failed"));
312 ck_fwrite (char const *buf, size_t size, FILE *f)
314 if (fwrite (buf, sizeof (char), size, f) != size)
315 perror_fatal (_("write failed"));
322 perror_fatal (_("write failed"));
326 expand_name (char *name, bool is_dir, char const *other_name)
328 if (STREQ (name, "-"))
329 fatal ("cannot interactively merge standard input");
334 /* Yield NAME/BASE, where BASE is OTHER_NAME's basename. */
335 char const *base = last_component (other_name);
336 size_t namelen = strlen (name), baselen = base_len (base);
337 bool insert_slash = *last_component (name) && name[namelen - 1] != '/';
338 char *r = xmalloc (namelen + insert_slash + baselen + 1);
339 memcpy (r, name, namelen);
341 memcpy (r + namelen + insert_slash, base, baselen);
342 r[namelen + insert_slash + baselen] = '\0';
355 lf_init (struct line_filter *lf, FILE *infile)
358 lf->bufpos = lf->buffer = lf->buflim = xmalloc (SDIFF_BUFSIZE + 1);
359 lf->buflim[0] = '\n';
362 /* Fill an exhausted line_filter buffer from its INFILE */
364 lf_refill (struct line_filter *lf)
366 size_t s = ck_fread (lf->buffer, SDIFF_BUFSIZE, lf->infile);
367 lf->bufpos = lf->buffer;
368 lf->buflim = lf->buffer + s;
369 lf->buflim[0] = '\n';
374 /* Advance LINES on LF's infile, copying lines to OUTFILE */
376 lf_copy (struct line_filter *lf, lin lines, FILE *outfile)
378 char *start = lf->bufpos;
382 lf->bufpos = (char *) memchr (lf->bufpos, '\n', lf->buflim - lf->bufpos);
385 ck_fwrite (start, lf->buflim - start, outfile);
386 if (! lf_refill (lf))
397 ck_fwrite (start, lf->bufpos - start, outfile);
400 /* Advance LINES on LF's infile without doing output */
402 lf_skip (struct line_filter *lf, lin lines)
406 lf->bufpos = (char *) memchr (lf->bufpos, '\n', lf->buflim - lf->bufpos);
409 if (! lf_refill (lf))
420 /* Snarf a line into a buffer. Return EOF if EOF, 0 if error, 1 if OK. */
422 lf_snarf (struct line_filter *lf, char *buffer, size_t bufsize)
426 char *start = lf->bufpos;
427 char *next = (char *) memchr (start, '\n', lf->buflim + 1 - start);
428 size_t s = next - start;
431 memcpy (buffer, start, s);
432 if (next < lf->buflim)
435 lf->bufpos = next + 1;
438 if (! lf_refill (lf))
446 main (int argc, char *argv[])
451 exit_failure = EXIT_TROUBLE;
452 initialize_main (&argc, &argv);
453 set_program_name (argv[0]);
454 setlocale (LC_ALL, "");
455 bindtextdomain (PACKAGE, LOCALEDIR);
456 textdomain (PACKAGE);
457 c_stack_action (cleanup);
459 prog = getenv ("EDITOR");
461 editor_program = prog;
463 diffarg (DEFAULT_DIFF_PROGRAM);
465 /* parse command line args */
466 while ((opt = getopt_long (argc, argv, "abBdEHiI:lo:stvw:WZ", longopts, 0))
505 diffarg ("--left-column");
513 suppress_common_lines = true;
521 version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version,
522 AUTHORS, (char *) NULL);
539 case DIFF_PROGRAM_OPTION:
540 diffargv[0] = optarg;
548 case STRIP_TRAILING_CR_OPTION:
549 diffarg ("--strip-trailing-cr");
553 diffarg ("--tabsize");
562 if (argc - optind != 2)
564 if (argc - optind < 2)
565 try_help ("missing operand after '%s'", argv[argc - 1]);
567 try_help ("extra operand '%s'", argv[optind + 2]);
572 /* easy case: diff does everything for us */
573 if (suppress_common_lines)
574 diffarg ("--suppress-common-lines");
577 diffarg (argv[optind]);
578 diffarg (argv[optind + 1]);
580 execvp (diffargv[0], (char **) diffargv);
581 perror_fatal (diffargv[0]);
585 char const *lname, *rname;
586 FILE *left, *right, *out, *diffout;
588 struct line_filter lfilt;
589 struct line_filter rfilt;
590 struct line_filter diff_filt;
591 bool leftdir = diraccess (argv[optind]);
592 bool rightdir = diraccess (argv[optind + 1]);
594 if (leftdir & rightdir)
595 fatal ("both files to be compared are directories");
597 lname = expand_name (argv[optind], leftdir, argv[optind + 1]);
598 left = ck_fopen (lname, "r");
599 rname = expand_name (argv[optind + 1], rightdir, argv[optind]);
600 right = ck_fopen (rname, "r");
601 out = ck_fopen (output, "w");
603 diffarg ("--sdiff-merge-assist");
605 diffarg (argv[optind]);
606 diffarg (argv[optind + 1]);
611 #if ! HAVE_WORKING_FORK
613 char *command = system_quote_argv (SCI_SYSTEM, (char **) diffargv);
615 diffout = popen (command, "r");
617 perror_fatal (command);
624 if (pipe (diff_fds) != 0)
625 perror_fatal ("pipe");
629 perror_fatal ("fork");
632 /* Alter the child's SIGINT and SIGPIPE handlers;
633 this may munge the parent.
634 The child ignores SIGINT in case the user interrupts the editor.
635 The child does not ignore SIGPIPE, even if the parent does. */
636 if (initial_handler (handler_index_of_SIGINT) != SIG_IGN)
637 signal_handler (SIGINT, SIG_IGN);
638 signal_handler (SIGPIPE, SIG_DFL);
640 if (diff_fds[1] != STDOUT_FILENO)
642 dup2 (diff_fds[1], STDOUT_FILENO);
646 execvp (diffargv[0], (char **) diffargv);
647 _exit (errno == ENOENT ? 127 : 126);
651 diffout = fdopen (diff_fds[0], "r");
653 perror_fatal ("fdopen");
657 lf_init (&diff_filt, diffout);
658 lf_init (&lfilt, left);
659 lf_init (&rfilt, right);
661 interact_ok = interact (&diff_filt, &lfilt, lname, &rfilt, rname, out);
671 #if ! HAVE_WORKING_FORK
672 wstatus = pclose (diffout);
677 while (waitpid (diffpid, &wstatus, 0) < 0)
681 perror_fatal ("waitpid");
694 check_child_status (werrno, wstatus, EXIT_FAILURE, diffargv[0]);
697 exit (WEXITSTATUS (wstatus));
700 return EXIT_SUCCESS; /* Fool '-Wall'. */
704 diffarg (char const *a)
706 static size_t diffargs, diffarglim;
708 if (diffargs == diffarglim)
712 else if (PTRDIFF_MAX / (2 * sizeof *diffargv) <= diffarglim)
716 diffargv = xrealloc (diffargv, diffarglim * sizeof *diffargv);
718 diffargv[diffargs++] = a;
721 /* Signal handling */
723 static bool volatile ignore_SIGINT;
724 static int volatile signal_received;
725 static bool sigs_trapped;
733 if (! (s == SIGINT && ignore_SIGINT))
738 static struct sigaction catchaction;
741 signal_handler (int sig, void (*handler) (int))
743 catchaction.sa_handler = handler;
744 sigaction (sig, &catchaction, 0);
754 catchaction.sa_flags = SA_RESTART;
755 sigemptyset (&catchaction.sa_mask);
756 for (i = 0; i < NUM_SIGS; i++)
757 sigaddset (&catchaction.sa_mask, sigs[i]);
760 for (i = 0; i < NUM_SIGS; i++)
763 sigaction (sigs[i], 0, &initial_action[i]);
765 initial_action[i] = signal (sigs[i], SIG_IGN);
767 if (initial_handler (i) != SIG_IGN)
768 signal_handler (sigs[i], catchsig);
772 /* System V fork+wait does not work if SIGCHLD is ignored. */
773 signal (SIGCHLD, SIG_DFL);
779 /* Untrap signal S, or all trapped signals if S is zero. */
786 for (i = 0; i < NUM_SIGS; i++)
787 if ((! s || sigs[i] == s) && initial_handler (i) != SIG_IGN)
790 sigaction (sigs[i], &initial_action[i], 0);
792 signal (sigs[i], initial_action[i]);
797 /* Exit if a signal has been received. */
801 int s = signal_received;
806 /* Yield an exit status indicating that a signal was received. */
810 /* That didn't work, so exit with error status. */
818 fprintf (stderr, "%s", _("\
819 ed:\tEdit then use both versions, each decorated with a header.\n\
820 eb:\tEdit then use both versions.\n\
821 el or e1:\tEdit then use the left version.\n\
822 er or e2:\tEdit then use the right version.\n\
823 e:\tDiscard both versions then edit a new one.\n\
824 l or 1:\tUse the left version.\n\
825 r or 2:\tUse the right version.\n\
826 s:\tSilently include common lines.\n\
827 v:\tVerbosely include common lines.\n\
839 if (! isspace (c) || c == '\n')
844 perror_fatal (_("read failed"));
852 while ((c = getchar ()) != '\n' && c != EOF)
855 perror_fatal (_("read failed"));
859 /* interpret an edit command */
861 edit (struct line_filter *left, char const *lname, lin lline, lin llen,
862 struct line_filter *right, char const *rname, lin rline, lin rlen,
867 int cmd0 IF_LINT (= 0);
868 int cmd1 IF_LINT (= 0);
873 if (putchar ('%') != '%')
874 perror_fatal (_("write failed"));
877 cmd0 = skip_white ();
880 case '1': case '2': case 'l': case 'r':
881 case 's': case 'v': case 'q':
882 if (skip_white () != '\n')
892 cmd1 = skip_white ();
895 case '1': case '2': case 'b': case 'd': case 'l': case 'r':
896 if (skip_white () != '\n')
934 lf_copy (left, llen, outfile);
935 lf_skip (right, rlen);
938 lf_copy (right, rlen, outfile);
939 lf_skip (left, llen);
942 suppress_common_lines = true;
945 suppress_common_lines = false;
954 tmp = fopen (tmpname, "w");
957 if ((fd = temporary_file ()) < 0)
958 perror_fatal ("mkstemp");
959 tmp = fdopen (fd, "w");
963 perror_fatal (tmpname);
971 fprintf (tmp, "--- %s %ld\n", lname, (long int) lline);
973 fprintf (tmp, "--- %s %ld,%ld\n", lname,
975 (long int) (lline + llen - 1));
978 case '1': case 'b': case 'l':
979 lf_copy (left, llen, tmp);
983 lf_skip (left, llen);
993 fprintf (tmp, "+++ %s %ld\n", rname, (long int) rline);
995 fprintf (tmp, "+++ %s %ld,%ld\n", rname,
997 (long int) (rline + rlen - 1));
1000 case '2': case 'b': case 'r':
1001 lf_copy (right, rlen, tmp);
1005 lf_skip (right, rlen);
1014 char const *argv[3];
1016 ignore_SIGINT = true;
1018 argv[0] = editor_program;
1023 #if ! HAVE_WORKING_FORK
1024 char *command = system_quote_argv (SCI_SYSTEM, (char **) argv);
1025 wstatus = system (command);
1035 execvp (editor_program, (char **) argv);
1036 _exit (errno == ENOENT ? 127 : 126);
1040 perror_fatal ("fork");
1042 while (waitpid (pid, &wstatus, 0) < 0)
1046 perror_fatal ("waitpid");
1050 ignore_SIGINT = false;
1051 check_child_status (werrno, wstatus, EXIT_SUCCESS,
1056 char buf[SDIFF_BUFSIZE];
1058 tmp = ck_fopen (tmpname, "r");
1059 while ((size = ck_fread (buf, SDIFF_BUFSIZE, tmp)) != 0)
1062 ck_fwrite (buf, size, outfile);
1075 /* Alternately reveal bursts of diff output and handle user commands. */
1077 interact (struct line_filter *diff,
1078 struct line_filter *left, char const *lname,
1079 struct line_filter *right, char const *rname,
1082 lin lline = 1, rline = 1;
1086 char diff_help[256];
1087 int snarfed = lf_snarf (diff, diff_help, sizeof diff_help);
1090 return snarfed != 0;
1094 if (diff_help[0] == ' ')
1095 puts (diff_help + 1);
1100 lin llen, rlen, lenmax;
1102 llen = val = strtoumax (diff_help + 1, &numend, 10);
1103 if (llen < 0 || llen != val || errno || *numend != ',')
1105 rlen = val = strtoumax (numend + 1, &numend, 10);
1106 if (rlen < 0 || rlen != val || errno || *numend)
1109 lenmax = MAX (llen, rlen);
1111 switch (diff_help[0])
1114 if (suppress_common_lines)
1115 lf_skip (diff, lenmax);
1117 lf_copy (diff, lenmax, stdout);
1119 lf_copy (left, llen, outfile);
1120 lf_skip (right, rlen);
1124 lf_copy (diff, lenmax, stdout);
1125 if (! edit (left, lname, lline, llen,
1126 right, rname, rline, rlen,
1141 /* Return true if DIR is an existing directory. */
1143 diraccess (char const *dir)
1146 return stat (dir, &buf) == 0 && S_ISDIR (buf.st_mode);
1150 # define P_tmpdir "/tmp"
1153 # define TMPDIR_ENV "TMPDIR"
1156 /* Open a temporary file and return its file descriptor. Put into
1157 tmpname the address of a newly allocated buffer that holds the
1158 file's name. Use the prefix "sdiff". */
1160 temporary_file (void)
1162 char const *tmpdir = getenv (TMPDIR_ENV);
1163 char const *dir = tmpdir ? tmpdir : P_tmpdir;
1164 char *buf = xmalloc (strlen (dir) + 1 + 5 + 6 + 1);
1166 sprintf (buf, "%s/sdiffXXXXXX", dir);