Changeset 3066 for trunk

Timestamp:

Apr 8, 2007, 11:08:24 PM (18 years ago)

Author:

bird

Message:

egrep, fgrep.

Location:

trunk/essentials/sys-apps/grep

Files:

• kNIX-bootstrap.kmk (modified) (1 diff)
• src/grep.c (modified) (1 diff)

trunk/essentials/sys-apps/grep/kNIX-bootstrap.kmk

@@ -68 +68 @@
 PROGRAMS += grep
 grep_TEMPLATE = greputils
-grep_INST = usr/bin/grep$(SUFF_EXE)# usr/bin/egrep$(SUFF_EXE) usr/bin/fgrep$(SUFF_EXE)
+grep_INST = usr/bin/grep$(SUFF_EXE) usr/bin/egrep$(SUFF_EXE) usr/bin/fgrep$(SUFF_EXE)
 grep_SOURCES = \
         src/grep.c \

trunk/essentials/sys-apps/grep/src/grep.c

@@ -1292 +1292 @@
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(__OS2__) /* || defined windows */
+  keys = strchr (program_name, '\0');
+  while (keys > program_name && keys[-1] != '\\' 
+      && keys[-1] != '/' && keys[-1] != ':')
+    keys--;
+  program_name = keys;
+  if (   !strnicmp (program_name, "egrep", 5)
+      && (!program_name[5] || program_name[5] == '.'))
+    setmatcher ("egrep");
+  else if (   !strnicmp (program_name, "fgrep", 5)
+           && (!program_name[5] || program_name[5] == '.'))
+    setmatcher ("fgrep");
+#else
   if (program_name && strrchr (program_name, '/'))
     program_name = strrchr (program_name, '/') + 1;
-
   if (!strcmp(program_name, "egrep"))
     setmatcher ("egrep");
   if (!strcmp(program_name, "fgrep"))
     setmatcher ("fgrep");
+#endif
 
 #if defined(__MSDOS__) || defined(_WIN32)