Changeset 37 for trunk/src/gcc/fastjar

Timestamp:

Apr 25, 2003, 6:54:01 PM (22 years ago)

Author:

bird

Message:

use xregex to avoid linking trouble

File:

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

trunk/src/gcc/fastjar/jargrep.c

@@ -3 +3 @@
   Copyright (C) 2002 Free Software Foundation
   Copyright (C) 1999, 2000 Bryan Burns
-  Copyright (C) 2000 Cory Hollingsworth 
- 
-  Parts of this program are base on Bryan Burns work with fastjar 
-  Copyright (C) 1999. 
+  Copyright (C) 2000 Cory Hollingsworth
+
+  Parts of this program are base on Bryan Burns work with fastjar
+  Copyright (C) 1999.
 
   This program is free software; you can redistribute it and/or
@@ -12 +12 @@
   as published by the Free Software Foundation; either version 2
   of the License, or (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -25 +25 @@
 /* Id: jargrep.c,v 1.5 2002/01/03 04:57:56 rodrigc Exp
 
-Log: jargrep.c,v 
+Log: jargrep.c,v
 Revision 1.5  2002/01/03 04:57:56  rodrigc
 2001-01-02  Craig Rodrigues  <rodrigc@gcc.gnu.org>
@@ -106 +106 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <regex.h>
+/* bird: use xregex to avoid linking trouble
+ * #include <regex.h>
+ */
+#include <xregex.h>
 #include <errno.h>
 #include <string.h>
@@ -140 +143 @@
         int retflag;
 
-        if((options & JG_PRINT_COUNT) && 
+        if((options & JG_PRINT_COUNT) &&
                 (options & (JG_PRINT_BYTEOFFSET | JG_PRINT_LINE_NUMBER)))
         {
@@ -152 +155 @@
 /*
 Function name: create_regexp
-args:   regstr  String containing the uncompiled regular expression.  This may be the 
+args:   regstr  String containing the uncompiled regular expression.  This may be the
                                 expression as is passed in through argv.
                 options This is the flag containing the commandline options that have been
                                 parsed by getopt.
-purpose: Handle the exception handling involved with setting upt a new regular 
+purpose: Handle the exception handling involved with setting upt a new regular
 expression.
 returns: Newly allocated compile regular expression ready to be used in an regexec call.
@@ -192 +195 @@
         }
 
-        return exp; 
+        return exp;
 }
 
@@ -211 +214 @@
         signature = UNPACK_UB4(scratch, 0);
 
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("signature is %x\n", signature);
 #endif
     if(signature == 0x08074b50){
-#ifdef DEBUG    
+#ifdef DEBUG
       printf("skipping data descriptor\n");
 #endif
@@ -221 +224 @@
       retflag = 2;
     } else if(signature == 0x02014b50){
-#ifdef DEBUG    
+#ifdef DEBUG
       printf("Central header reached.. we're all done!\n");
 #endif
@@ -229 +232 @@
       retflag = 1;
     }
-    
+
         return retflag;
 }
@@ -247 +250 @@
 static void decd_siz(ub4 *csize, ub4 *usize, ub2 *fnlen, ub2 *eflen, ub2 *flags, ub2 *method, ub1 *file_header) {
     *csize = UNPACK_UB4(file_header, LOC_CSIZE);
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("Compressed size is %u\n", *csize);
 #endif
@@ -257 +260 @@
 
     *fnlen = UNPACK_UB2(file_header, LOC_FNLEN);
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("Filename length is %hu\n", *fnlen);
 #endif
 
     *eflen = UNPACK_UB2(file_header, LOC_EFLEN);
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("Extra field length is %hu\n", *eflen);
 #endif
 
     *flags = UNPACK_UB2(file_header, LOC_EXTRA);
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("Flags are %#hx\n", *flags);
 #endif
@@ -296 +299 @@
     filename[len] = '\0';
 
-#ifdef DEBUG    
+#ifdef DEBUG
     printf("filename is %s\n", filename);
 #endif
@@ -414 +417 @@
                 num                     Number of matches in pmatch array.
                 lines           Number of lines in file.  Not set if -n is not set on command line.
-                options         Bitwise flag containing flags set to represent the command line 
+                options         Bitwise flag containing flags set to represent the command line
                                         options.
 purpose:        Control output of jargrep.  Output is controlled by which options have been
@@ -495 +498 @@
         size_t i;
 
-        for(i = 0; i < usize; i++) 
+        for(i = 0; i < usize; i++)
                 if(stream[i] != '\t'
                    && (iscntrl((unsigned char)stream[i])
@@ -520 +523 @@
 
         match_array = NULL;
-        for(*i = 0, regflag = regexec(exp, str_stream, 1, &match, 0); !regflag; 
+        for(*i = 0, regflag = regexec(exp, str_stream, 1, &match, 0); !regflag;
                 regflag = regexec(exp, &(str_stream[match.rm_eo]), 1, &match, 0), (*i)++)
         {
-                if((tmp = (regmatch_t *) 
+                if((tmp = (regmatch_t *)
                     realloc(match_array, sizeof(regmatch_t) * ((*i) + 1))))
                 {
@@ -538 +541 @@
                         exit(1);
                 }
-        } 
+        }
 
         return match_array;
@@ -582 +585 @@
                 lseek(fd, eflen, SEEK_CUR);
                 if(filename[fnlen - 1] != '/') {
-                        str_stream = (method == 8 || (flags & 0x0008)) ? 
-                                (char *) inflate_string(pbf, &csize, &usize) : 
+                        str_stream = (method == 8 || (flags & 0x0008)) ?
+                                (char *) inflate_string(pbf, &csize, &usize) :
                                         read_string(pbf, csize);
                         if(flags & 0x008) check_crc(pbf, str_stream, usize);
                         mk_ascii(str_stream, usize);
                         match_array = fnd_match(exp, str_stream, &i);
-                        if((options & JG_PRINT_LINE_NUMBER) && i) 
+                        if((options & JG_PRINT_LINE_NUMBER) && i)
                                 nl_offsets = fnd_match(nl_exp, str_stream, &j);
                         prnt_mtchs(exp, filename, str_stream, match_array, nl_offsets, i, j, options);
@@ -604 +607 @@
 Funtion name: jargrep
 args:   exp             Pointer to compiled POSIX style regular expression of search target.
-                nl_exp  Pointer to compiled regular expression for newlines or NULL.  Only set 
+                nl_exp  Pointer to compiled regular expression for newlines or NULL.  Only set
                                 if -n option is present at command line.
                 jarfile Filename of jar file to be searched.