diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-15 07:09:34 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-15 07:09:34 +0000 |
| commit | 33aeb00c4daa9fed804a4da2a6e20c45f5194305 (patch) | |
| tree | 8e4e5932bdfd43357d5df21a2be1e0a4eb0aff99 /gnu/usr.bin/diff/diff.c.diff | |
| parent | dc06cc570ef6d63ec097c5389fbf75646fa5a768 (diff) | |
| download | FreeBSD-src-33aeb00c4daa9fed804a4da2a6e20c45f5194305.zip FreeBSD-src-33aeb00c4daa9fed804a4da2a6e20c45f5194305.tar.gz | |
Update build skeleton after diffutils 2.8.7 update.
Diffstat (limited to 'gnu/usr.bin/diff/diff.c.diff')
| -rw-r--r-- | gnu/usr.bin/diff/diff.c.diff | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/gnu/usr.bin/diff/diff.c.diff b/gnu/usr.bin/diff/diff.c.diff new file mode 100644 index 0000000..884a9c4 --- /dev/null +++ b/gnu/usr.bin/diff/diff.c.diff @@ -0,0 +1,69 @@ +$FreeBSD$ +--- diff.c.orig 2004-04-12 15:44:35.000000000 +0800 ++++ diff.c 2007-06-15 14:51:05.506679851 +0800 +@@ -137,7 +137,7 @@ + } + + static char const shortopts[] = +-"0123456789abBcC:dD:eEfF:hHiI:lL:nNpPqrsS:tTuU:vwW:x:X:y"; ++"0123456789abBcC:dD:eEfF:hHiI:lL:nNopPqrsS:tTuU:vwW:x:X:y"; + + /* Values for long options that do not have single-letter equivalents. */ + enum +@@ -265,14 +265,15 @@ + initialize_main (&argc, &argv); + program_name = argv[0]; + setlocale (LC_ALL, ""); +- bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + c_stack_action (0); + function_regexp_list.buf = &function_regexp; + ignore_regexp_list.buf = &ignore_regexp; +- re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING); ++ re_set_syntax (RE_SYNTAX_GREP); + excluded = new_exclude (); + ++ prepend_default_options (getenv ("DIFF_OPTIONS"), &argc, &argv); ++ + /* Decode the options. */ + + while ((c = getopt_long (argc, argv, shortopts, longopts, 0)) != -1) +@@ -428,6 +429,11 @@ + new_file = true; + break; + ++ case 'o': ++ /* Output in the old tradition style. */ ++ specify_style (OUTPUT_NORMAL); ++ break; ++ + case 'p': + show_c_function = true; + add_regexp (&function_regexp_list, "^[[:alpha:]$_]"); +@@ -983,8 +989,6 @@ + { + if (output_style != style) + { +- if (output_style != OUTPUT_UNSPECIFIED) +- try_help ("conflicting output style options", 0); + output_style = style; + } + } +@@ -997,7 +1001,7 @@ + #ifdef ST_MTIM_NSEC + + # if HAVE_CLOCK_GETTIME && defined CLOCK_REALTIME +- if (clock_gettime (CLOCK_REALTIME, &st->st_mtim) == 0) ++ if (clock_gettime (CLOCK_REALTIME, &st->st_mtimespec) == 0) + return; + # endif + +@@ -1007,7 +1011,7 @@ + if (gettimeofday (&timeval, 0) == 0) + { + st->st_mtime = timeval.tv_sec; +- st->st_mtim.ST_MTIM_NSEC = timeval.tv_usec * 1000; ++ st->st_mtimespec.ST_MTIM_NSEC = timeval.tv_usec * 1000; + return; + } + } |
