[Ipcop-svn] SF.net SVN: ipcop:[1676] ipcop/trunk/src/installer/setup.c

[<ow...@us...>]

Revision: 1676
          http://ipcop.svn.sourceforge.net/ipcop/?rev=1676&view=rev
Author:   owes
Date:     2008-08-11 13:57:00 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
apply Coding Style

Modified Paths:
--------------
    ipcop/trunk/src/installer/setup.c

Modified: ipcop/trunk/src/installer/setup.c
===================================================================
--- ipcop/trunk/src/installer/setup.c	2008-08-11 10:47:00 UTC (rev 1675)
+++ ipcop/trunk/src/installer/setup.c	2008-08-11 13:57:00 UTC (rev 1676)
@@ -42,127 +42,117 @@
 
 char *ipcop_gettext(char *txt)
 {
-  return gettext(txt);
+    return gettext(txt);
 }
 
 
 int main(int argc, char **argv)
 {
-  int i;
-  int rc;
-  int choice;
-  char *menuchoices[10];
+    int i;
+    int rc;
+    int choice;
+    char *menuchoices[10];
 
-  /* check cmd line */
-  for(i = 1; i < argc; i++)
-  {
-    if ( !strcmp(argv[i], "INSTALL") )
-    {
-      flag_installer = 1;
+    /* check cmd line */
+    for (i = 1; i < argc; i++) {
+        if (!strcmp(argv[i], "INSTALL")) {
+            flag_installer = 1;
+        }
     }
-  }
 
-  if ( flag_installer )
-  {
-    if (!(flog=fopen("/dev/tty2", "w+")))
-    {
-      printf("Failed to open /dev/tty2 for logging\n");
-      exit(0);
+    if (flag_installer) {
+        if (!(flog = fopen("/dev/tty2", "w+"))) {
+            printf("Failed to open /dev/tty2 for logging\n");
+            exit(0);
+        }
+
+        fstderr = freopen("/dev/tty3", "w+", stderr);
     }
+    else {
+        // owes: flog is helpful for hw detection, may need to change to something other than tty5 one day
+        if (!(flog = fopen("/dev/tty5", "w+"))) {
+            printf("Failed to open /dev/tty5 for logging\n");
+            exit(0);
+        }
 
-    fstderr = freopen("/dev/tty3", "w+", stderr);
-  }
-  else
-  {
-    // owes: flog is helpful for hw detection, may need to change to something other than tty5 one day
-    if (!(flog=fopen("/dev/tty5", "w+")))
-    {
-      printf("Failed to open /dev/tty5 for logging\n");
-      exit(0);
+        fstderr = freopen("/dev/tty6", "w+", stderr);
     }
 
-    fstderr = freopen("/dev/tty6", "w+", stderr);
-  }
+    newtInit();
+    newtCls();
 
-  newtInit();
-  newtCls();
+    /* Have to get proper locale here */
+    read_kv_from_file(&kv, CONFIG_ROOT "/main/settings");
+    strcpy(selected_locale, "en_GB");
+    find_kv_default(kv, "LOCALE", selected_locale);
+    /* We store locale as en_GB not as en_GB.utf8 in settings 
+       append .utf8 to make setlocale happy.
+     */
+    strcat(selected_locale, ".utf8");
 
-  /* Have to get proper locale here */
-  read_kv_from_file(&kv, CONFIG_ROOT "/main/settings");
-	strcpy(selected_locale, "en_GB");
-	find_kv_default(kv, "LOCALE", selected_locale);
-  /* We store locale as en_GB not as en_GB.utf8 in settings 
-      append .utf8 to make setlocale happy.
-  */
-  strcat(selected_locale, ".utf8");
+    bindtextdomain("install", "/usr/share/locale");
+    textdomain("install");
+    setlocale(LC_ALL, selected_locale);
 
-  bindtextdomain("install", "/usr/share/locale");
-  textdomain("install");
-  setlocale(LC_ALL, selected_locale);
+    menuchoices[0] = gettext("TR_KEYBOARD_MAPPING");
+    menuchoices[1] = gettext("TR_TIMEZONE");
+    menuchoices[2] = gettext("TR_HOSTNAME");
+    menuchoices[3] = gettext("TR_DOMAINNAME");
+    menuchoices[4] = gettext("TR_NETWORKING");
+    menuchoices[5] = gettext("TR_PASSWORDS");
+    menuchoices[6] = NULL;
 
-  menuchoices[0] = gettext("TR_KEYBOARD_MAPPING");
-  menuchoices[1] = gettext("TR_TIMEZONE");
-  menuchoices[2] = gettext("TR_HOSTNAME");
-  menuchoices[3] = gettext("TR_DOMAINNAME");
-  menuchoices[4] = gettext("TR_NETWORKING");
-  menuchoices[5] = gettext("TR_PASSWORDS");
-  menuchoices[6] = NULL;
+    newtDrawRootText(18, 0, get_title());
+    newtPushHelpLine(gettext("TR_HELPLINE"));
 
-  newtDrawRootText(18, 0, get_title());
-  newtPushHelpLine(gettext("TR_HELPLINE"));
-
-  if ( flag_installer )
-  {
-    /* all settings in a row, no main menu */
-    handlekeymap();
-    handletimezone();
-    handledatetime();
-    handlehostname();
-    handledomainname();
-    handlenetworking();
-    password("root");
-    password("admin");
-    password("backup");
-  }
-  else
-  {
-    choice = 0;
-    for (;;)
-    {
-      rc = newtWinMenu(gettext("TR_SECTION_MENU"),
-        gettext("TR_SELECT_THE_ITEM"), 50, 5, 5, 11,
-        menuchoices, &choice, gettext("TR_OK"), gettext("TR_QUIT"), NULL);
-      
-      if (rc == 2)
-        break;
-
-      switch ( choice )
-      {
-      case 0:
+    if (flag_installer) {
+        /* all settings in a row, no main menu */
         handlekeymap();
-        break;
-      case 1:
         handletimezone();
-        break;
-      case 2:
+        handledatetime();
         handlehostname();
-        break;
-      case 3:
         handledomainname();
-        break;
-      case 4:
         handlenetworking();
-        break;
-      case 5:
-        handlepasswords();
-        break;
-    
-      default:
-        break;
-      }
-    }     
-  }
-  newtFinished();
+        password("root");
+        password("admin");
+        password("backup");
+    }
+    else {
+        choice = 0;
+        for (;;) {
+            rc = newtWinMenu(gettext("TR_SECTION_MENU"),
+                             gettext("TR_SELECT_THE_ITEM"), 50, 5, 5, 11,
+                             menuchoices, &choice, gettext("TR_OK"), gettext("TR_QUIT"), NULL);
 
-  exit(0);
+            if (rc == 2)
+                break;
+
+            switch (choice) {
+            case 0:
+                handlekeymap();
+                break;
+            case 1:
+                handletimezone();
+                break;
+            case 2:
+                handlehostname();
+                break;
+            case 3:
+                handledomainname();
+                break;
+            case 4:
+                handlenetworking();
+                break;
+            case 5:
+                handlepasswords();
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+    newtFinished();
+
+    exit(0);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.