Revision: 2731
http://ipcop.svn.sourceforge.net/ipcop/?rev=2731&view=rev
Author: gespinasse
Date: 2009-04-19 18:19:10 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
Fix the mysterious issue with mysystem by removing unneeded \n at end of
commands for udhcpc and ifconfig
We could avoid the long else as we return at end of if (mysystem(command)
Add an error box in case the interface fail to go up
Modified Paths:
--------------
ipcop/trunk/langs/af_ZA/install.po
ipcop/trunk/langs/bg_BG/install.po
ipcop/trunk/langs/ca_ES/install.po
ipcop/trunk/langs/cs_CZ/install.po
ipcop/trunk/langs/da_DK/install.po
ipcop/trunk/langs/de_DE/install.po
ipcop/trunk/langs/el_GR/install.po
ipcop/trunk/langs/en_GB/install.po
ipcop/trunk/langs/es_ES/install.po
ipcop/trunk/langs/es_UY/install.po
ipcop/trunk/langs/fa_IR/install.po
ipcop/trunk/langs/fi_FI/install.po
ipcop/trunk/langs/fr_FR/install.po
ipcop/trunk/langs/gu_IN/install.po
ipcop/trunk/langs/hu_HU/install.po
ipcop/trunk/langs/install.new.en.pl
ipcop/trunk/langs/it_IT/install.po
ipcop/trunk/langs/ja_JP/install.po
ipcop/trunk/langs/lt_LT/install.po
ipcop/trunk/langs/nb_NO/install.po
ipcop/trunk/langs/nl_NL/install.po
ipcop/trunk/langs/pl_PL/install.po
ipcop/trunk/langs/pt_BR/install.po
ipcop/trunk/langs/pt_PT/install.po
ipcop/trunk/langs/ro_RO/install.po
ipcop/trunk/langs/ru_RU/install.po
ipcop/trunk/langs/sk_SK/install.po
ipcop/trunk/langs/sl_SI/install.po
ipcop/trunk/langs/so_SO/install.po
ipcop/trunk/langs/sv_SE/install.po
ipcop/trunk/langs/th_TH/install.po
ipcop/trunk/langs/tr_TR/install.po
ipcop/trunk/langs/ur_PK/install.po
ipcop/trunk/langs/vi_VN/install.po
ipcop/trunk/langs/zh_CN/install.po
ipcop/trunk/langs/zh_TW/install.po
ipcop/trunk/src/installer/installer.c
Modified: ipcop/trunk/langs/af_ZA/install.po
===================================================================
--- ipcop/trunk/langs/af_ZA/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/af_ZA/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Fout met met skryf van konfigurasie inligting."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/bg_BG/install.po
===================================================================
--- ipcop/trunk/langs/bg_BG/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/bg_BG/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/ca_ES/install.po
===================================================================
--- ipcop/trunk/langs/ca_ES/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/ca_ES/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/cs_CZ/install.po
===================================================================
--- ipcop/trunk/langs/cs_CZ/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/cs_CZ/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Chyba při zápisu údajů o nastavení."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "soubor %s nenalezen"
#### NEW:
Modified: ipcop/trunk/langs/da_DK/install.po
===================================================================
--- ipcop/trunk/langs/da_DK/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/da_DK/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Fejl ved skrivning af konfigurationsinformation."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "Filen %s blev ikke fundet"
#### NEW:
Modified: ipcop/trunk/langs/de_DE/install.po
===================================================================
--- ipcop/trunk/langs/de_DE/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/de_DE/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -144,6 +144,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Fehler beim Schreiben der Konfigurationsinformationen."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s Datei nicht gefunden"
#### NEW:
Modified: ipcop/trunk/langs/el_GR/install.po
===================================================================
--- ipcop/trunk/langs/el_GR/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/el_GR/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Υπήρξε λάθος κατά την διάρκεια εγγραφής των πληροφοριών των ρυθμίσεων."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s αρχείο δεν βρέθηκε"
#### NEW:
Modified: ipcop/trunk/langs/en_GB/install.po
===================================================================
--- ipcop/trunk/langs/en_GB/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/en_GB/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -140,6 +140,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/es_ES/install.po
===================================================================
--- ipcop/trunk/langs/es_ES/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/es_ES/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -144,6 +144,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error al escribir la configuración."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "No se ha encontrado el fichero %s."
#### NEW:
Modified: ipcop/trunk/langs/es_UY/install.po
===================================================================
--- ipcop/trunk/langs/es_UY/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/es_UY/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error al escribir la configuración."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s archivo no encontrado"
#### NEW:
Modified: ipcop/trunk/langs/fa_IR/install.po
===================================================================
--- ipcop/trunk/langs/fa_IR/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/fa_IR/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/fi_FI/install.po
===================================================================
--- ipcop/trunk/langs/fi_FI/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/fi_FI/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Asetuksen kirjoittamisessa tapahtui virhe."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/fr_FR/install.po
===================================================================
--- ipcop/trunk/langs/fr_FR/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/fr_FR/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -145,6 +145,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Erreur d'écriture du fichier de configuration."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "fichier %s introuvable"
#### NEW:
Modified: ipcop/trunk/langs/gu_IN/install.po
===================================================================
--- ipcop/trunk/langs/gu_IN/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/gu_IN/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/hu_HU/install.po
===================================================================
--- ipcop/trunk/langs/hu_HU/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/hu_HU/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Hiba történt a konfigurációs információk írása közben."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/install.new.en.pl
===================================================================
--- ipcop/trunk/langs/install.new.en.pl 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/install.new.en.pl 2009-04-19 18:19:10 UTC (rev 2731)
@@ -60,6 +60,7 @@
'TR_INSTALLATION_CANCELED' => 'Installation cancelled.',
'TR_INSTALLING_FILES' => 'Installing files...',
'TR_INTERFACE' => '%s interface',
+'TR_INTERFACE_FAIL_TO_GET_UP_CR' => 'Interface %s fail to get up\n',
'TR_INTERFACE_SELECTION' => 'Interface selection',
'TR_INTERFACE_SELECTION_LONG' => 'Select the interface to use for
installation',
'TR_INVALID_FIELDS' => 'The following fields are invalid:',
Modified: ipcop/trunk/langs/it_IT/install.po
===================================================================
--- ipcop/trunk/langs/it_IT/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/it_IT/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Errore nella scrittura delle informazioni di configurazione."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file non trovato"
#### NEW:
Modified: ipcop/trunk/langs/ja_JP/install.po
===================================================================
--- ipcop/trunk/langs/ja_JP/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/ja_JP/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/lt_LT/install.po
===================================================================
--- ipcop/trunk/langs/lt_LT/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/lt_LT/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/nb_NO/install.po
===================================================================
--- ipcop/trunk/langs/nb_NO/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/nb_NO/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -145,6 +145,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Feil ved skriving av oppsettinformasjon."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s fant ikke filen"
#### NEW:
Modified: ipcop/trunk/langs/nl_NL/install.po
===================================================================
--- ipcop/trunk/langs/nl_NL/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/nl_NL/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -149,6 +149,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Er is een fout opgetreden tijdens het schrijven van de configuratie
informatie."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s bestand niet gevonden"
#### NEW:
Modified: ipcop/trunk/langs/pl_PL/install.po
===================================================================
--- ipcop/trunk/langs/pl_PL/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/pl_PL/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Błąd przy zapisywaniu konfiguracji"
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/pt_BR/install.po
===================================================================
--- ipcop/trunk/langs/pt_BR/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/pt_BR/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Erro gravando a configuração."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s arquivo não encontrado"
#### NEW:
Modified: ipcop/trunk/langs/pt_PT/install.po
===================================================================
--- ipcop/trunk/langs/pt_PT/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/pt_PT/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Erro gravando a configuração."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/ro_RO/install.po
===================================================================
--- ipcop/trunk/langs/ro_RO/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/ro_RO/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/ru_RU/install.po
===================================================================
--- ipcop/trunk/langs/ru_RU/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/ru_RU/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/sk_SK/install.po
===================================================================
--- ipcop/trunk/langs/sk_SK/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/sk_SK/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Nastala chyba pri zápise údajov o nastavení."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "Súbor %s nebol nájdený"
#### NEW:
Modified: ipcop/trunk/langs/sl_SI/install.po
===================================================================
--- ipcop/trunk/langs/sl_SI/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/sl_SI/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/so_SO/install.po
===================================================================
--- ipcop/trunk/langs/so_SO/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/so_SO/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Khalad qoraal ooka yimid qaabdhisida."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/sv_SE/install.po
===================================================================
--- ipcop/trunk/langs/sv_SE/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/sv_SE/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Misslyckades skriva konfigurationsinformation."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s filen saknas"
#### NEW:
Modified: ipcop/trunk/langs/th_TH/install.po
===================================================================
--- ipcop/trunk/langs/th_TH/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/th_TH/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/tr_TR/install.po
===================================================================
--- ipcop/trunk/langs/tr_TR/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/tr_TR/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -143,6 +143,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Konfigürasyon bilgisi yazılamadı."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/ur_PK/install.po
===================================================================
--- ipcop/trunk/langs/ur_PK/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/ur_PK/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Error writing configuration information."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/vi_VN/install.po
===================================================================
--- ipcop/trunk/langs/vi_VN/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/vi_VN/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "Lỗi ghi thông tin cấu hình."
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file không tìm thấy"
#### NEW:
Modified: ipcop/trunk/langs/zh_CN/install.po
===================================================================
--- ipcop/trunk/langs/zh_CN/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/zh_CN/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "写入设定信息错误"
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/langs/zh_TW/install.po
===================================================================
--- ipcop/trunk/langs/zh_TW/install.po 2009-04-19 17:21:23 UTC (rev 2730)
+++ ipcop/trunk/langs/zh_TW/install.po 2009-04-19 18:19:10 UTC (rev 2731)
@@ -142,6 +142,8 @@
msgstr "Date or Time incorrect."
msgid "TR_ERROR_WRITING_CONFIG"
msgstr "寫入設定信息錯誤"
+msgid "TR_FAIL_TO_SET_INTERFACE_UP_CR"
+msgstr "TR_FAIL_TO_SET_INTERFACE_UP_CR"
msgid "TR_FILE_NOT_FOUND"
msgstr "%s file not found"
#### NEW:
Modified: ipcop/trunk/src/installer/installer.c
===================================================================
--- ipcop/trunk/src/installer/installer.c 2009-04-19 17:21:23 UTC (rev
2730)
+++ ipcop/trunk/src/installer/installer.c 2009-04-19 18:19:10 UTC (rev
2731)
@@ -168,44 +168,43 @@
static int find_network_by_dhcp(int itf)
{
char string[STRING_SIZE];
- snprintf(command, STRING_SIZE, "udhcpc -q -n -T 3 -A 1 -t 3 -i eth%d -s
/usr/bin/udhcpc.script > /dev/null\n", itf);
+ snprintf(command, STRING_SIZE, "udhcpc -q -n -T 3 -A 1 -t 3 -i eth%d -s
/usr/bin/udhcpc.script > /dev/null", itf);
if (mysystem(command)) {
fprintf(flog, "udhcpc fail with eth%d\n", itf);
return FAILURE;
- } else {
- /* The DHCP server could very well be our http/ftp server,
- * if not probably close enough to present it's IP */
- NODEKV *kv_dhcp_params = NULL;
+ }
+ /* The DHCP server could very well be our http/ftp server,
+ * if not probably close enough to present it's IP */
+ NODEKV *kv_dhcp_params = NULL;
- snprintf(string, STRING_SIZE, "/etc/dhcp-eth%d.params", itf);
- if (read_kv_from_file(&kv_dhcp_params, string)) {
- return FAILURE;
- }
- snprintf(itf_name, STRING_SIZE, "eth%d", itf);
- if (find_kv(kv_dhcp_params, "SERVERID") == NULL) {
- fprintf(flog, "udhcpc SERVERID not found\n");
- return FAILURE;
- }
- strcat(server_IP, find_kv(kv_dhcp_params, "SERVERID"));
- if (find_kv(kv_dhcp_params, "IP") == NULL) {
- fprintf(flog, "udhcpc IP not found\n");
- return FAILURE;
- }
- strcat(local_IP, find_kv(kv_dhcp_params, "IP"));
- if (find_kv(kv_dhcp_params, "NETMASK") == NULL) {
- fprintf(flog, "udhcpc NETMASK not found\n");
- return FAILURE;
- }
- strcat(netmask, find_kv(kv_dhcp_params, "NETMASK"));
- /* domain is not mandatory */
- if (find_kv(kv_dhcp_params, "DOMAIN") == NULL) {
- fprintf(flog, "udhcpc DOMAIN not found\n");
- } else {
- strcat(domain, find_kv(kv_dhcp_params, "DOMAIN"));
- }
- free_kv(&kv_dhcp_params);
- return SUCCESS;
+ snprintf(string, STRING_SIZE, "/etc/dhcp-eth%d.params", itf);
+ if (read_kv_from_file(&kv_dhcp_params, string)) {
+ return FAILURE;
}
+ snprintf(itf_name, STRING_SIZE, "eth%d", itf);
+ if (find_kv(kv_dhcp_params, "SERVERID") == NULL) {
+ fprintf(flog, "udhcpc SERVERID not found\n");
+ return FAILURE;
+ }
+ strcat(server_IP, find_kv(kv_dhcp_params, "SERVERID"));
+ if (find_kv(kv_dhcp_params, "IP") == NULL) {
+ fprintf(flog, "udhcpc IP not found\n");
+ return FAILURE;
+ }
+ strcat(local_IP, find_kv(kv_dhcp_params, "IP"));
+ if (find_kv(kv_dhcp_params, "NETMASK") == NULL) {
+ fprintf(flog, "udhcpc NETMASK not found\n");
+ return FAILURE;
+ }
+ strcat(netmask, find_kv(kv_dhcp_params, "NETMASK"));
+ /* domain is not mandatory */
+ if (find_kv(kv_dhcp_params, "DOMAIN") == NULL) {
+ fprintf(flog, "udhcpc DOMAIN not found\n");
+ } else {
+ strcat(domain, find_kv(kv_dhcp_params, "DOMAIN"));
+ }
+ free_kv(&kv_dhcp_params);
+ return SUCCESS;
}
@@ -352,9 +351,13 @@
}
/* configure the selected interface */
- snprintf(command, STRING_SIZE, "ifconfig %s %s netmask %s up\n", itf_name,
local_IP, netmask);
+ snprintf(command, STRING_SIZE, "ifconfig %s %s netmask %s up", itf_name,
local_IP, netmask);
if (mysystem(command)) {
- fprintf(flog, "Fail to set interface %s up\n", itf_name);
+ /* workaround gcc warning, there is really 1 %s there */
+ tmpstring = strdup(gettext("TR_FAIL_TO_SET_INTERFACE_UP_CR"));
+ snprintf(message, STRING_SIZE, tmpstring, itf_name);
+ free(tmpstring);
+ errorbox(message);
return FAILURE;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
