 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.de,v 1.13.2.1 2019/08/18 13:21:40 msaitoh Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.13.2.2 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -669,28 +669,31 @@ message resolv
+}
 /* Called with: 			Example
  *  $0 = target prefix			/target/etc
  *  $1 = error message			No such file or directory
  */
 message realdir
 {Konnte nicht in das Verzeichnis $0 wechseln: $1
 Installation abgebrochen.}
 message delete_xfer_file
 {Nach der Installation l�schen}
 /* Called with: 			Example
  *  $0 = set name			base
  */
 message notarfile
-{Das Release-Paket %s existiert nicht.}
+{Das Release-Paket $0 existiert nicht.}
 message endtarok
 {Alle Distributionspakete wurden erfolgreich entpackt.}
 message endtar
 {Beim Entpacken der Distributionspakete sind Probleme aufgetreten.
 Ihre Installation ist daher unvollst�ndig.
 Sie haben %d Distributionssets ausgew�hlt. %d davon wurden nicht
 gefunden und %d wegen eines Fehlers �bersprungen.
 Von %d zu entpackenden Paketen sind %d erfolgreich und %d
 mit Fehler entpackt worden.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.en,v 1.19.2.1 2019/08/18 13:21:40 msaitoh Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.19.2.2 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -642,28 +642,31 @@ message resolv
+}
 /* Called with: 			Example
  *  $0 = target prefix			/target
  *  $1 = error message			No such file or directory
  */
 message realdir
 {Could not change to directory $0: $1.
 Install aborted.}
 message delete_xfer_file
 {Delete after install}
 /* Called with: 			Example
  *  $0 = set name			base
  */
 message notarfile
-{Release set %s does not exist.}
+{Release set $0 does not exist.}
 message endtarok
 {All selected distribution sets unpacked successfully.}
 message endtar
 {There were problems unpacking distribution sets.
 Your installation is incomplete.
 You selected %d distribution sets.  %d sets couldn't be found
 and %d were skipped after an error occurred.  Of the %d
 that were attempted, %d unpacked without errors and %d with errors.
 Aborting installation.  Please recheck your distribution source

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.es,v 1.14.2.1 2019/08/18 13:21:40 msaitoh Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.14.2.2 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -658,28 +658,31 @@ message resolv
+}
 /* Called with: 			Example
  *  $0 = target prefix			/target
  *  $1 = error message			No such file or directory
  */
 message realdir
 {No se ha podido cambiar el directorio a $0: $1
 Instalaci�n interrumpida.}
 message delete_xfer_file
 {A eliminar despu�s de la instalaci�n}
 /* Called with: 			Example
  *  $0 = set name			base
  */
 message notarfile
-{El conjunto %s no existe.}
+{El conjunto $0 no existe.}
 message endtarok
 {Todos los conjuntos de distribuci�n han sido desempaquetados
 correctamente.}
 message endtar
 {Ha habido problemas al desempaquetar los conjuntos de la distribuci�n.
 Su instalaci�n est� incompleta.
 Ha seleccionado %d conjuntos de distribuci�n.  %d conjuntos no han sido
 encontrados, y %d han sido omitidos despu�s de que ocurriera un
 error.  De los %d que se han intentado, %d se han desempaquetado
 sin errores y %d con errores.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.fr,v 1.17.2.1 2019/08/18 13:21:40 msaitoh Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.17.2.2 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -674,28 +674,31 @@ Impossible de cr�er le fichier /etc/reso
  *  $0 = target prefix			/target
  *  $1 = error message			No such file or directory
  */
 message realdir
+{
 Impossible de d�placer le r�pertoire $0: $1
 �chec de l'installation.}
 message delete_xfer_file
+{
 Effacer apr�s l'installation
+}
 /* Called with: 			Example
  *  $0 = set name			base
  */
 message notarfile
-{Le composant %s n'existe pas.}
+{Le composant $0 n'existe pas.}
 message endtarok
+{
 Tous les composants sont install�s. Veuillez appuyer sur la touche
 Entr�e pour continuer.
+}
 message endtar
+{
 L'installation des composants est termin�e. Toutefois, un ou plusieurs
 probl�mes sont survenus au cours de leur extraction.
 Vous avez s�lectionn� %d composants. %d n'ont pu �tre install�s,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.pl,v 1.20.2.1 2019/08/18 13:21:40 msaitoh Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.20.2.2 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp       */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -638,28 +638,31 @@ message resolv
+}
 /* Called with: 			Example
  *  $0 = target prefix			/target
  *  $1 = error message			No such file or directory
  */
 message realdir
 {Nie moglem przejsc do katalogu $0: $1
 Instalacja przerwana.}
 message delete_xfer_file
 {Usun po zakonczeniu instalacji}
 /* Called with: 			Example
  *  $0 = set name			base
  */
 message notarfile
-{Pakiet %s nie istnieje.}
+{Pakiet $0 nie istnieje.}
 message endtarok
 {Wszystkie wybrane pakiety dystrybucji zostaly rozpakowane.}
 message endtar
 {Wystapil blad w trackie rozpakowywania pakietow.
 Twoja instalacja jest niekompletna.
 Wybrales %d pakietow dystrybucyjnych. %d pakiety nie zostaly znalezione
 i %d zostalo pominietych z powodu bledow. Z %d docelowych,
 %d rozpakowalo sie bez bledow i %d z bledami.
 Instalacja zostala przerwana. Sprawdz zrodlo swojej dystrybucji i rozwaz

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.29 2019/07/24 10:22:04 roy Exp $	*/
+/*	$NetBSD: util.c,v 1.29.2.1 2019/08/18 13:25:21 msaitoh Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -906,40 +906,45 @@ extract_file(distinfo *dist, int update)
 	owd = getcwd(NULL, 0);
 	/* Do we need to fetch the file now? */
 	if (fetch_fn != NULL) {
 		rval = fetch_fn(dist->name);
 		if (rval != SET_OK)
 			return rval;
+	}
 	/* check tarfile exists */
 	if (!file_exists_p(path)) {
 #ifdef SUPPORT_8_3_SOURCE_FILESYSTEM
-	/*
+		/*
-	 * Update path to use dist->name truncated to the first eight
+		 * Update path to use dist->name truncated to the first eight
-	 * characters and check again
+		 * characters and check again
-	 */
+		 */
-	(void)snprintf(path, sizeof path, "%s/%.8s%.4s", /* 4 as includes '.' */
+		(void)snprintf(path, sizeof path,
-	    ext_dir_for_set(dist->name), dist->name, set_postfix(dist->name));
+		    "%s/%.8s%.4s", /* 4 as includes '.' */
 		    ext_dir_for_set(dist->name), dist->name,
 		    set_postfix(dist->name));
 		if (!file_exists_p(path)) {
 #endif /* SUPPORT_8_3_SOURCE_FILESYSTEM */
 			tarstats.nnotfound++;
-		tarstats.nnotfound++;
+			char *err = str_arg_subst(msg_string(MSG_notarfile),
 , &dist->name);
-		hit_enter_to_continue(MSG_notarfile, NULL);
+			hit_enter_to_continue(err, NULL);
-		return SET_RETRY;
+			free(err);
 			return SET_RETRY;
+		}
 #ifdef SUPPORT_8_3_SOURCE_FILESYSTEM
+	}
 #endif /* SUPPORT_8_3_SOURCE_FILESYSTEM */
 	tarstats.nfound++;
 	/* cd to the target root. */
 	if (update && (dist->set == SET_ETC || dist->set == SET_X11_ETC)) {
 		make_target_dir("/.sysinst");
 		target_chdir_or_die("/.sysinst");
 	} else if (dist->set == SET_PKGSRC)
 		target_chdir_or_die("/usr");
 	else
 		target_chdir_or_die("/");