git.gag.com Git - debian/as31/blob - debian/patches/as31-fix-duplicate-line.patch

   1 diff --git a/as31/run.c b/as31/run.c
   2 index 28c5317..9e5263b 100644
   3 --- a/as31/run.c
   4 +++ b/as31/run.c
   5 @@ -113,7 +113,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
   6         }
   7
   8         while (!feof(finPre)) {
   9 -               getline(&lineBuffer,&sizeBuf,finPre);
  10 +               if (getline(&lineBuffer,&sizeBuf,finPre) == -1)
  11 +                       break;
  12                 if ((includePtr=strstr(lineBuffer,INC_CMD))) {
  13                         includePtr=includePtr+strlen(INC_CMD);
  14                         while ((*includePtr==' ')||             //move includePtr to filename
  15 @@ -138,7 +139,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
  16                                 mesg_f("Cannot open include file: %s\n",includePtr);
  17                         } else {
  18                                 while (!feof(includeFile)) {
  19 -                                       getline(&incLineBuffer,&incSizeBuf,includeFile);
  20 +                                       if (getline(&incLineBuffer,&incSizeBuf,includeFile) == -1)
  21 +                                               break;
  22                                         fprintf(fin,"%s",incLineBuffer);
  23                                         if (strlen(incLineBuffer)) {
  24                                                 incLineCount++;
  25 diff --git a/debian/patches/as31-fix-duplicate-line.patch b/debian/patches/as31-fix-duplicate-line.patch
  26 index e5a6064..e69de29 100644
  27 --- a/debian/patches/as31-fix-duplicate-line.patch
  28 +++ b/debian/patches/as31-fix-duplicate-line.patch
  29 @@ -1,22 +0,0 @@
  30 ---- as31-2.3.1-orig/as31/run.c 2012-01-11 19:29:35.000000000 -0500
  31 -+++ as31-2.3.1/as31/run.c      2012-01-11 19:31:56.000000000 -0500
  32 -@@ -106,7 +106,8 @@
  33 -       }
  34 -
  35 -       while (!feof(finPre)) {
  36 --              getline(&lineBuffer,&sizeBuf,finPre);
  37 -+              if (getline(&lineBuffer,&sizeBuf,finPre) == -1)
  38 -+                      break;
  39 -               if ((includePtr=strstr(lineBuffer,INC_CMD))) {
  40 -                       includePtr=includePtr+strlen(INC_CMD);
  41 -                       while ((*includePtr==' ')||             //move includePtr to filename
  42 -@@ -131,7 +132,8 @@
  43 -                               mesg_f("Cannot open include file: %s\n",includePtr);
  44 -                       } else {
  45 -                               while (!feof(includeFile)) {
  46 --                                      getline(&incLineBuffer,&incSizeBuf,includeFile);
  47 -+                                      if (getline(&incLineBuffer,&incSizeBuf,includeFile) == -1)
  48 -+                                              break;
  49 -                                       fprintf(fin,"%s",incLineBuffer);
  50 -                                       if (strlen(incLineBuffer)) {
  51 -                                               incLineCount++;