summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1994-02-16 21:32:01 +0000
committerRoland McGrath <roland@redhat.com>1994-02-16 21:32:01 +0000
commitd68bb0895be0a78b26de5a9e88e36196e21429fc (patch)
tree36bb5ee1b62af41c050b2c7eae00a2e7e6867f23
parent29b051dc0c5d983037f5793b60874073f71cddbb (diff)
downloadgunmake-d68bb0895be0a78b26de5a9e88e36196e21429fc.tar.gz
entered into RCS
-rw-r--r--arscan.c10
-rw-r--r--default.c6
2 files changed, 14 insertions, 2 deletions
diff --git a/arscan.c b/arscan.c
index f3bb3ce..da9428d 100644
--- a/arscan.c
+++ b/arscan.c
@@ -1,5 +1,5 @@
/* Library function for scanning an archive file.
- Copyright (C) 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1987, 89, 91, 92, 93, 94 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -428,7 +428,13 @@ ar_name_equal (name, mem, truncated)
#else
struct ar_hdr hdr;
return !strncmp (name, mem,
- sizeof (hdr.ar_name) - 1);
+ sizeof (hdr.ar_name) -
+#ifndef __hpux
+ 1
+#else
+ 2
+#endif /* __hpux */
+ );
#endif
}
diff --git a/default.c b/default.c
index 3465c53..c8502a9 100644
--- a/default.c
+++ b/default.c
@@ -195,7 +195,13 @@ static char *default_suffix_rules[] =
static char *default_variables[] =
{
"AR", "ar",
+#ifndef __hpux
"ARFLAGS", "rv",
+#else
+ /* HPUX ar's f flag says to truncate the file names to archive member
+ name length in comparisons, so replacement notices the equality. */
+ "ARFLAGS", "rfv",
+#endif
"AS", "as",
"CC", "cc",
"CXX", "g++",