X-Git-Url: https://git.gag.com/?p=debian%2Fas31;a=blobdiff_plain;f=debian%2Fpatches%2Fas31-fix-duplicate-line.patch;fp=debian%2Fpatches%2Fas31-fix-duplicate-line.patch;h=9a96d54073994829ca947019ce59e04a990f99a6;hp=e5a6064c4a35f282335d7d351e0ab40b1e521148;hb=9fd7ee58c688689460537d64b4f18a1c091412d1;hpb=97389251a4130cb361712468419692a4b52619c7

diff --git a/debian/patches/as31-fix-duplicate-line.patch b/debian/patches/as31-fix-duplicate-line.patch
index e5a6064..9a96d54 100644
--- a/debian/patches/as31-fix-duplicate-line.patch
+++ b/debian/patches/as31-fix-duplicate-line.patch
@@ -1,6 +1,8 @@
---- as31-2.3.1-orig/as31/run.c	2012-01-11 19:29:35.000000000 -0500
-+++ as31-2.3.1/as31/run.c	2012-01-11 19:31:56.000000000 -0500
-@@ -106,7 +106,8 @@
+diff --git a/as31/run.c b/as31/run.c
+index 28c5317..9e5263b 100644
+--- a/as31/run.c
++++ b/as31/run.c
+@@ -113,7 +113,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
  	}
  
  	while (!feof(finPre)) {
@@ -10,7 +12,7 @@
  		if ((includePtr=strstr(lineBuffer,INC_CMD))) {
  			includePtr=includePtr+strlen(INC_CMD);
  			while ((*includePtr==' ')||		//move includePtr to filename
-@@ -131,7 +132,8 @@
+@@ -138,7 +139,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
  				mesg_f("Cannot open include file: %s\n",includePtr);
  			} else {
  				while (!feof(includeFile)) {
@@ -20,3 +22,30 @@
  					fprintf(fin,"%s",incLineBuffer);
  					if (strlen(incLineBuffer)) {
  						incLineCount++;
+diff --git a/debian/patches/as31-fix-duplicate-line.patch b/debian/patches/as31-fix-duplicate-line.patch
+index e5a6064..e69de29 100644
+--- a/debian/patches/as31-fix-duplicate-line.patch
++++ b/debian/patches/as31-fix-duplicate-line.patch
+@@ -1,22 +0,0 @@
+---- as31-2.3.1-orig/as31/run.c	2012-01-11 19:29:35.000000000 -0500
+-+++ as31-2.3.1/as31/run.c	2012-01-11 19:31:56.000000000 -0500
+-@@ -106,7 +106,8 @@
+- 	}
+- 
+- 	while (!feof(finPre)) {
+--		getline(&lineBuffer,&sizeBuf,finPre);
+-+		if (getline(&lineBuffer,&sizeBuf,finPre) == -1)
+-+			break;
+- 		if ((includePtr=strstr(lineBuffer,INC_CMD))) {
+- 			includePtr=includePtr+strlen(INC_CMD);
+- 			while ((*includePtr==' ')||		//move includePtr to filename
+-@@ -131,7 +132,8 @@
+- 				mesg_f("Cannot open include file: %s\n",includePtr);
+- 			} else {
+- 				while (!feof(includeFile)) {
+--					getline(&incLineBuffer,&incSizeBuf,includeFile);
+-+					if (getline(&incLineBuffer,&incSizeBuf,includeFile) == -1)
+-+						break;
+- 					fprintf(fin,"%s",incLineBuffer);
+- 					if (strlen(incLineBuffer)) {
+- 						incLineCount++;