about summary refs log tree commit diff
path: root/locale/programs/ld-telephone.c
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs/ld-telephone.c')
-rw-r--r--locale/programs/ld-telephone.c60
1 files changed, 53 insertions, 7 deletions
diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c
index 2d75fea6b6..5d2ea490ad 100644
--- a/locale/programs/ld-telephone.c
+++ b/locale/programs/ld-telephone.c
@@ -50,8 +50,11 @@ telephone_startup (struct linereader *lr, struct localedef_t *locale,
     locale->categories[LC_TELEPHONE].telephone = (struct locale_telephone_t *)
       xcalloc (1, sizeof (struct locale_telephone_t));
 
-  lr->translate_strings = 1;
-  lr->return_widestr = 0;
+  if (lr != NULL)
+    {
+      lr->translate_strings = 1;
+      lr->return_widestr = 0;
+    }
 }
 
 
@@ -60,11 +63,46 @@ telephone_finish (struct localedef_t *locale, struct charmap_t *charmap)
 {
   struct locale_telephone_t *telephone =
     locale->categories[LC_TELEPHONE].telephone;
+  int nothing = 0;
+
+  /* Now resolve copying and also handle completely missing definitions.  */
+  if (telephone == NULL)
+    {
+      /* First see whether we were supposed to copy.  If yes, find the
+	 actual definition.  */
+      if (locale->copy_name[LC_TELEPHONE] != NULL)
+	{
+	  /* Find the copying locale.  This has to happen transitively since
+	     the locale we are copying from might also copying another one.  */
+	  struct localedef_t *from = locale;
+
+	  do
+	    from = find_locale (LC_TELEPHONE, from->copy_name[LC_TELEPHONE],
+				from->repertoire_name, charmap);
+	  while (from->categories[LC_TELEPHONE].telephone == NULL
+		 && from->copy_name[LC_TELEPHONE] != NULL);
+
+	  telephone = locale->categories[LC_TELEPHONE].telephone
+	    = from->categories[LC_TELEPHONE].telephone;
+	}
+
+      /* If there is still no definition issue an warning and create an
+	 empty one.  */
+      if (telephone == NULL)
+	{
+	  error (0, 0, _("No definition for %s category found"),
+		 "LC_TELEPHONE");
+	  telephone_startup (NULL, locale, 0);
+	  telephone = locale->categories[LC_TELEPHONE].telephone;
+	  nothing = 1;
+	}
+    }
 
   if (telephone->tel_int_fmt == NULL)
     {
-      error (0, 0, _("%s: field `%s' not defined"),
-	     "LC_TELEPHONE", "tel_int_fmt");
+      if (! nothing)
+	error (0, 0, _("%s: field `%s' not defined"),
+	       "LC_TELEPHONE", "tel_int_fmt");
       /* Use as the default value the value of the i18n locale.  */
       telephone->tel_int_fmt = "+%c %a %l";
     }
@@ -120,7 +158,7 @@ telephone_finish (struct localedef_t *locale, struct charmap_t *charmap)
 #define TEST_ELEM(cat) \
   if (telephone->cat == NULL)						      \
     {									      \
-      if (verbose)							      \
+      if (verbose && ! nothing)						      \
 	error (0, 0, _("%s: field `%s' not defined"), "LC_TELEPHONE", #cat);  \
       telephone->cat = "";						      \
     }
@@ -207,8 +245,8 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result,
   /* If we see `copy' now we are almost done.  */
   if (nowtok == tok_copy)
     {
-      handle_copy (ldfile, charmap, repertoire, tok_lc_telephone, LC_TELEPHONE,
-		   "LC_TELEPHONE", ignore_content);
+      handle_copy (ldfile, charmap, repertoire, result, tok_lc_telephone,
+		   LC_TELEPHONE, "LC_TELEPHONE", ignore_content);
       return;
     }
 
@@ -234,6 +272,14 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result,
 	{
 #define STR_ELEM(cat) \
 	case tok_##cat:							      \
+	  /* Ignore the rest of the line if we don't need the input of	      \
+	     this line.  */						      \
+	  if (ignore_content)						      \
+	    {								      \
+	      lr_ignore_rest (ldfile, 0);				      \
+	      break;							      \
+	    }								      \
+									      \
 	  arg = lr_token (ldfile, charmap, NULL);			      \
 	  if (arg->tok != tok_string)					      \
 	    goto err_label;						      \