Fix the path for fstrace message catalogs

Apply quilt patch fstrace-paths: fstrace uses the NLS functions to
do message translation and needs a message catalog installed.  The
default paths are rather broken.  Patch the source to look for it in
/usr/share/openafs instead.  Not suitable upstream with the hard-coded
paths, but something more sophisticated would be appropriate.

diff --git a/debian/patches/fstrace-paths b/debian/patches/fstrace-paths
deleted file mode 100644 (file)
index 728e193..0000000
--- a/debian/patches/fstrace-paths
+++ /dev/null
@@ -1,27 +0,0 @@
-fstrace uses the NLS functions to do message translation and needs a
-message catalog installed.  The default paths are rather broken.  Patch
-the source to look for it in /usr/share/openafs instead.  Not suitable
-upstream with the hard-coded paths, but something more sophisticated
-would be appropriate.
-
---- openafs.orig/src/venus/fstrace.c
-+++ openafs/src/venus/fstrace.c
-@@ -1466,7 +1466,7 @@
-  */
- 
- #ifndef RPC_NLS_FORMAT
--#define RPC_NLS_FORMAT "%s.cat"
-+#define RPC_NLS_FORMAT "/usr/share/openafs/%s.cat"
- #endif
- 
- dce1_error_inq_text(status_to_convert, error_text, status)
-@@ -1483,7 +1483,8 @@
-     char component_name[4];
-     char *facility_name;
-     char filename_prefix[7];
--    char nls_filename[11];
-+    /* strlen("/usr/share/openafs/") + 6 + strlen(".cat") + 1 */
-+    char nls_filename[19 + 6 + 4 + 1];
-     char alt_filename[80];
-     char *message;
- #if defined(AFS_64BITPOINTER_ENV)

diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c
index 200b6fefeba425db57c0725a3fb552f83fdaaa02..ac9ce087fc9f573edd44fe4d03169b1ce1643f07 100644 (file)
--- a/src/venus/fstrace.c
+++ b/src/venus/fstrace.c
@@ -1466,7 +1466,7 @@ catgets1(nl_catd catd, int setno, int msgno, char *def)
  */
 
 #ifndef RPC_NLS_FORMAT
-#define RPC_NLS_FORMAT "%s.cat"
+#define RPC_NLS_FORMAT "/usr/share/openafs/%s.cat"
 #endif
 
 dce1_error_inq_text(status_to_convert, error_text, status)
@@ -1483,7 +1483,8 @@ dce1_error_inq_text(status_to_convert, error_text, status)
     char component_name[4];
     char *facility_name;
     char filename_prefix[7];
-    char nls_filename[11];
+    /* strlen("/usr/share/openafs/") + 6 + strlen(".cat") + 1 */
+    char nls_filename[19 + 6 + 4 + 1];
     char alt_filename[80];
     char *message;
 #if defined(AFS_64BITPOINTER_ENV)