Changeset 1394 for trunk/src/gcc/fastjar/jargrep.c

Timestamp:

Apr 28, 2004, 6:58:06 AM (21 years ago)

Author:

bird

Message:

#1040: Joined the GCC 3.3.3 with the trunk.

File:

• trunk/src/gcc/fastjar/jargrep.c (modified) (5 diffs, 1 prop)

trunk/src/gcc/fastjar/jargrep.c

@@ -1 +1 @@
 /*
   jargrep.c - main functions for jargrep utility
-  Copyright (C) 2002 Free Software Foundation
+  Copyright (C) 2002, 2003 Free Software Foundation
   Copyright (C) 1999, 2000 Bryan Burns
   Copyright (C) 2000 Cory Hollingsworth
@@ -106 +106 @@
 #include <stdio.h>
 #include <unistd.h>
-/* bird: use xregex to avoid linking trouble
- * #include <regex.h>
- */
-#include <xregex.h>
 #include <errno.h>
 #include <string.h>
@@ -119 +115 @@
 #include <stdlib.h>
 #endif
+
+#include "xregex.h"
+
 #include "jargrep.h"
 #include "jartool.h"
@@ -130 +129 @@
 void help(const char *name);
 
-#define Usage "Usage: %s [-bcinsw] <-e PATTERN | PATTERN> FILE ...\n"
+#define Usage "Usage: %s [-bcinsVw] [--version|--help] <-e PATTERN | PATTERN> FILE ...\n"
 
 /*
@@ -773 +772 @@
    -s                suppress error messages\n\
    -w                force PATTERN to match only whole words\n\
-   -e PATTERN        use PATTERN as regular exprssion\n\
+   -e PATTERN        use PATTERN as regular expression\n\
+   -V|--version      print version number and exit\n\
+   --help            print help\n\
 ");