Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-26 02:29:31 +00:00
Code Issues Projects Releases Wiki Activity

patch: accept and ignore -g NUM

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-22 05:10:33 +01:00
parent 6f99c91e43
commit 8b8d32ea56
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editors/patch.c
View File

@ -80,8 +80,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
OPT_N = (1 << 3), OPT_N = (1 << 3),
/*OPT_f = (1 << 4), ignored */ /*OPT_f = (1 << 4), ignored */
/*OPT_E = (1 << 5), ignored, this is the default */ /*OPT_E = (1 << 5), ignored, this is the default */
// /*OPT_g = (1 << x), ignored */ /*OPT_g = (1 << 6), ignored */
OPT_dry_run = (1 << 6) * ENABLE_LONG_OPTS, OPT_dry_run = (1 << 7) * ENABLE_LONG_OPTS,
}; };
xfunc_error_retval = 2; xfunc_error_retval = 2;
@ -101,8 +101,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
/* "Controls actions when a file is under RCS or SCCS control, /* "Controls actions when a file is under RCS or SCCS control,
* and does not exist or is read-only and matches the default version, * and does not exist or is read-only and matches the default version,
* or when a file is under ClearCase control and does not exist..." * or when a file is under ClearCase control and does not exist..."
* IOW: does anyone really wants this? */ * IOW: rather obscure option.
// "get\0" Required_argument "g" /*ignored*/ * But Gentoo's portage does use -g0 */
"get\0" Required_argument "g" /*ignored*/
# endif # endif
"dry-run\0" No_argument "\xfd" "dry-run\0" No_argument "\xfd"
# if ENABLE_DESKTOP # if ENABLE_DESKTOP
@ -112,8 +113,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
; ;
applet_long_options = patch_longopts; applet_long_options = patch_longopts;
#endif #endif
/* -f,-E are ignored */ /* -f,-E,-g are ignored */
opt = getopt32(argv, "p:i:RN""fE"/*"g:"*/, &p, &i /*,NULL*/); opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
if (opt & OPT_R) if (opt & OPT_R)
plus = '-'; plus = '-';
patch_level = xatoi(p); /* can be negative! */ patch_level = xatoi(p); /* can be negative! */