foremost/trunk/foremost-1.5.7-fno-common.patch

   1 diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
   2 --- foremost-1.5.7/api.c.me     2020-02-06 14:15:48.218200745 +0100
   3 +++ foremost-1.5.7/api.c        2020-02-06 14:16:42.624853860 +0100
   4 @@ -20,6 +20,7 @@ int                           currFATblk;
   5  int                            highblk = 0;
   6  int                            block_list[OUR_BLK_SIZE / sizeof(int)];
   7  extern int             errno;
   8 +struct DIRECTORY *dirlist, *dl;
   9
  10  /*Inititialize those globals used by extract_ole*/
  11  void init_ole()
  12 diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
  13 --- foremost-1.5.7/extract.c.me 2020-02-06 14:10:30.446386101 +0100
  14 +++ foremost-1.5.7/extract.c    2020-02-06 14:15:14.736798823 +0100
  15 @@ -25,6 +25,7 @@ extern char *extract_name;
  16  extern int     extract;
  17  extern int     FATblk;
  18  extern int     highblk;
  19 +extern struct DIRECTORY *dirlist, *dl;
  20
  21  /********************************************************************************
  22   *Function: extract_zip
  23 diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
  24 --- foremost-1.5.7/main.h.me    2020-02-06 13:48:46.923922983 +0100
  25 +++ foremost-1.5.7/main.h       2020-02-06 13:50:08.001849830 +0100
  26 @@ -292,7 +292,7 @@ char *__progname;
  27  /* -----------------------------------------------------------------
  28     State Variable and Global Variables
  29     ----------------------------------------------------------------- */
  30 -char wildcard;
  31 +extern char wildcard;
  32  typedef struct f_state
  33  {
  34    off_t mode;
  35 @@ -344,7 +344,7 @@ typedef struct s_spec
  36      int written; /*used for -a mode*/
  37  }s_spec;
  38
  39 -s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
  40 +extern s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
  41
  42  typedef struct f_info {
  43    char *file_name;
  44 @@ -367,7 +367,7 @@ typedef struct f_info {
  45  } f_info;
  46
  47  /* Set if the user hits ctrl-c */
  48 -int signal_caught;
  49 +extern int signal_caught;
  50
  51  /* -----------------------------------------------------------------
  52     Function definitions
  53 @@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
  54  char *human_readable(off_t size, char *buffer);
  55  char *units(unsigned int c);
  56  unsigned int chop(char *buf);
  57 -void print_search_specs(f_state *s);
  58 +extern void print_search_specs(f_state *s);
  59  int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);
  60  int charactersMatch(char a, char b, int caseSensitive);
  61  void printx(unsigned char* buf,int start, int end);
  62 diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
  63 --- foremost-1.5.7/ole.h.me     2020-02-06 14:08:16.524783353 +0100
  64 +++ foremost-1.5.7/ole.h        2020-02-06 14:10:02.954056080 +0100
  65 @@ -84,8 +84,8 @@ struct DIRECTORY
  66         int             s2;
  67         int             d1;
  68         int             d2;
  69 -}
  70 -*dirlist, *dl;
  71 +};
  72 +
  73
  74  int                            get_dir_block(unsigned char *fd, int blknum, int buffersize);
  75  int                            get_dir_info(unsigned char *src);
  76 diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
  77 --- foremost-1.5.7/state.c.me   2020-02-06 14:06:44.514684887 +0100
  78 +++ foremost-1.5.7/state.c      2020-02-06 14:08:03.329625827 +0100
  79 @@ -2,6 +2,9 @@
  80
  81  #include "main.h"
  82
  83 +s_spec search_spec[50];
  84 +char wildcard;
  85 +
  86  int initialize_state (f_state * s, int argc, char **argv)
  87         {
  88         char    **argv_copy = argv;
  89 diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
  90 --- foremost-1.5.7/main.c.me    2020-02-06 14:20:09.918342282 +0100
  91 +++ foremost-1.5.7/main.c       2020-02-06 14:20:42.531733786 +0100
  92 @@ -15,6 +15,7 @@
  93   *
  94   */
  95  #include "main.h"
  96 +int signal_caught;
  97
  98  #ifdef __WIN32
  99