about summary refs log tree commit diff
path: root/locale/programs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-17 07:36:53 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-17 07:36:53 +0000
commitb2386e4ed44e075f69ac9e768f266ee404ca6713 (patch)
treeecf2f801f0c812c7dff624f19dd4a5cbdebe5140 /locale/programs
parentf065a05b69f6438b5e49335ea7b302efee30fafc (diff)
downloadglibc-b2386e4ed44e075f69ac9e768f266ee404ca6713.tar.gz
glibc-b2386e4ed44e075f69ac9e768f266ee404ca6713.tar.xz
glibc-b2386e4ed44e075f69ac9e768f266ee404ca6713.zip
Update.
	* locale/programs/charmap.c (charmap_read): Find charmap also in
	the standard directory.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/charmap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index b4bce4fe34..0c54c78ad4 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -99,6 +99,15 @@ charmap_read (const char *filename)
 			}
 		    }
 		}
+
+	      if (cmfile == NULL)
+		{
+		  /* Try the default directory.  */
+		  char path[sizeof (CHARMAP_PATH) + strlen (filename) + 1];
+
+		  stpcpy (stpcpy (stpcpy (path, CHARMAP_PATH), "/"), filename);
+		  cmfile = lr_open (path, charmap_hash);
+		}
 	    }
 	}