gnokii/common cfgreader.c,1.42,1.43

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/common
In directory subversions:/tmp/cvs-serv10351/common

Modified Files:
        cfgreader.c 
Log Message:
rfcomm_channel config option added


Index: cfgreader.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/cfgreader.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** cfgreader.c 28 Apr 2003 15:08:12 -0000      1.42
--- cfgreader.c 20 Nov 2003 20:58:42 -0000      1.43
***************
*** 379,382 ****
--- 379,389 ----
                snprintf(cfg->disconnect_script, 
sizeof(cfg->disconnect_script), "%s", val);
  
+       if (!(val = gn_cfg_get(gn_cfg_info, section, "rfcomm_channel")))
+               cfg->rfcomm_cn = def->rfcomm_cn;
+       else if (sscanf(val, " %d %c", &cfg->rfcomm_cn, &ch) != 1) {
+               fprintf(stderr, _("Unsupported [%s] %s value \"%s\"\n"), 
section, "rfcomm_channel", val);
+               return false;
+       }
+ 
        return true;
  }
***************
*** 440,443 ****
--- 447,451 ----
        strcpy(gn_config_default.connect_script, "");
        strcpy(gn_config_default.disconnect_script, "");
+       gn_config_default.rfcomm_cn = 1;
  
        if (!cfg_psection_load(&gn_config_global, "global", &gn_config_default))
***************
*** 454,459 ****
        (char *)*bindir = gn_cfg_get(gn_cfg_info, "global", "bindir");
        if (!*bindir) (char *)*bindir = default_bindir;
- 
-       gn_config_global.rfcomm_cn = 1;
  
        return 0;
--- 462,465 ----