File bug-841457_make-savannah-bug30612-handling_of_a... of Package make

Overview Repositories Revisions Requests Users Attributes Meta

File bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt of Package make (Revision c01566948c06b0f17821423e910581c3)

Currently displaying revision c01566948c06b0f17821423e910581c3 , Show latest

diff --git a/read.c b/read.c
index 8587e85..370009d 100644
--- a/read.c
+++ b/read.c
@@ -3047,16 +3047,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
                       nlen -= (n + 1) - tp;
                       tp = n + 1;
 
-                      /* If we have just "lib(", part of something like
-                         "lib( a b)", go to the next item.  */
-                      if (! nlen)
-                        continue;
-
                       /* We can stop looking now.  */
                       break;
                     }
                 }
               while (*e != '\0');
+
+              /* If we have just "lib(", part of something like "lib( a b)",
+                 go to the next item.  */
+              if (! nlen)
+                continue;
             }
         }
 
diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 00aa1af..3fe46a0 100644
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -36,6 +36,11 @@ utouch(-50, 'a2.o');
 run_make_test('all: libxx.a(a3.o *.o)', '',
               "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
 
+# Check whitespace handling
+utouch(-40, 'a2.o');
+run_make_test('all: libxx.a(  a3.o    *.o     )', '',
+              "ar rv libxx.a a2.o\nr - a2.o\n");
+
 rmfiles(qw(a1.o a2.o a3.o libxx.a));
 
 # This tells the test driver that the perl test script executed properly.
-- 
1.8.4

Places

File bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt of Package make (Revision c01566948c06b0f17821423e910581c3)

Places