[Gnu-arch-users] [MERGE REQUEST] Patch for archives starting with numbers

[Jan Hudec]

Bug: 72

The bug contains a patch. This mail is a remainder that it should be
applied. Two possible patches follow (they are ALTERNATIVE). The first
is probably prefered, but I think it's up to Tom to make final decision.

Both versions change very same place -- the regexp that gives files the
A_ namespace tag. The first version is more conservative (but sufficient
because non-alphanumerics are not allowed on archive creation). Patches
apply to current version, with offset.

Since arch does not allow anything but alphanumerics, ., @ and - in
archive names, this fix should be correct:

--- tla-20040103/src/tla/libarch/inv-ids.c.orig 2004-01-03 12:42:16.000000000 
+0100
+++ tla-20040103/src/tla/libarch/inv-ids.c      2004-01-03 19:08:19.000000000 
+0100
@@ -1165,7 +1165,7 @@
     {
       int re_error;

-      re_error = regcomp (&pattern, 
"^(.*/)?(\\{arch\\}(/[a-zA-Z=][^/~]*)*|\\{arch\\}/\\.arch-project-tree)$", 
REG_EXTENDED);
+      re_error = regcomp (&pattern, 
"^(.*/)?(\\{arch\\}(/[a-zA-Z0-9.=-][^/~]*)*|\\{arch\\}/\\.arch-project-tree)$", 
REG_EXTENDED);
       invariant (!re_error);
       compiled = 1;
     }

Alternative is to say that anything containing @-sign is correct under
{arch}:

--- tla-20040103/src/tla/libarch/inv-ids.c.orig 2004-01-03 12:42:16.000000000 
+0100
+++ tla-20040103/src/tla/libarch/inv-ids.c      2004-01-03 19:08:19.000000000 
+0100
@@ -1165,7 +1165,7 @@
     {
       int re_error;

-      re_error = regcomp (&pattern, 
"^(.*/)?(\\{arch\\}(/[a-zA-Z=][^/~]*)*|\\{arch\\}/\\.arch-project-tree)$", 
REG_EXTENDED);
+      re_error = regcomp (&pattern, 
"^(.*/)?(\\{arch\\}(/[a-zA-Z=][^/~]*|[^/address@hidden/~]*)*|\\{arch\\}/\\.arch-project-tree)$",
 REG_EXTENDED);
       invariant (!re_error);
       compiled = 1;
     }


-------------------------------------------------------------------------------
                                                 Jan 'Bulb' Hudec 
<address@hidden>

signature.asc
Description: Digital signature