2 --- diff.c.orig 2004-04-12 15:44:35.000000000 +0800
3 +++ diff.c 2007-06-15 14:51:05.506679851 +0800
7 static char const shortopts[] =
8 -"0123456789abBcC:dD:eEfF:hHiI:lL:nNpPqrsS:tTuU:vwW:x:X:y";
9 +"0123456789abBcC:dD:eEfF:hHiI:lL:nNopPqrsS:tTuU:vwW:x:X:y";
11 /* Values for long options that do not have single-letter equivalents. */
14 initialize_main (&argc, &argv);
15 program_name = argv[0];
16 setlocale (LC_ALL, "");
17 - bindtextdomain (PACKAGE, LOCALEDIR);
20 function_regexp_list.buf = &function_regexp;
21 ignore_regexp_list.buf = &ignore_regexp;
22 - re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING);
23 + re_set_syntax (RE_SYNTAX_GREP);
24 excluded = new_exclude ();
26 + prepend_default_options (getenv ("DIFF_OPTIONS"), &argc, &argv);
28 /* Decode the options. */
30 while ((c = getopt_long (argc, argv, shortopts, longopts, 0)) != -1)
36 + /* Output in the old tradition style. */
37 + specify_style (OUTPUT_NORMAL);
41 show_c_function = true;
42 add_regexp (&function_regexp_list, "^[[:alpha:]$_]");
45 if (output_style != style)
47 - if (output_style != OUTPUT_UNSPECIFIED)
48 - try_help ("conflicting output style options", 0);
55 # if HAVE_CLOCK_GETTIME && defined CLOCK_REALTIME
56 - if (clock_gettime (CLOCK_REALTIME, &st->st_mtim) == 0)
57 + if (clock_gettime (CLOCK_REALTIME, &st->st_mtimespec) == 0)
62 if (gettimeofday (&timeval, 0) == 0)
64 st->st_mtime = timeval.tv_sec;
65 - st->st_mtim.ST_MTIM_NSEC = timeval.tv_usec * 1000;
66 + st->st_mtimespec.ST_MTIM_NSEC = timeval.tv_usec * 1000;