lowercasing filenames, part1; makefile adjustments
[picodrive.git] / platform / common / config.c
index c117fb9..2704aca 100644 (file)
@@ -1,45 +1,61 @@
 /*
  * Human-readable config file management for PicoDrive
- * (c)
+ * (c) notaz, 2008
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef __EPOC32__
+#include <unistd.h>
+#endif
 #include "config.h"
+#include "lprintf.h"
+
+static char *mystrip(char *str);
+
+#ifndef _MSC_VER
+
 #include "menu.h"
 #include "emu.h"
-#include "lprintf.h"
-#include <Pico/Pico.h>
+#include <pico/pico.h>
 
 extern menu_entry opt_entries[];
 extern menu_entry opt2_entries[];
 extern menu_entry cdopt_entries[];
+extern menu_entry ctrlopt_entries[];
 extern const int opt_entry_count;
 extern const int opt2_entry_count;
 extern const int cdopt_entry_count;
+extern const int ctrlopt_entry_count;
+#ifdef PSP
+extern menu_entry opt3_entries[];
+extern const int opt3_entry_count;
+#endif
 
-static menu_entry *cfg_opts[] = { opt_entries, opt2_entries, cdopt_entries };
-static const int *cfg_opt_counts[] = { &opt_entry_count, &opt2_entry_count, &cdopt_entry_count };
-
-#define NL "\n"
-
-
-static char *mystrip(char *str)
+static menu_entry *cfg_opts[] =
 {
-       int i, len;
-
-       len = strlen(str);
-       for (i = 0; i < len; i++)
-               if (str[i] != ' ') break;
-       if (i > 0) memmove(str, str + i, len - i + 1);
+       opt_entries,
+       opt2_entries,
+       cdopt_entries,
+       ctrlopt_entries,
+#ifdef PSP
+       opt3_entries,
+#endif
+};
 
-       len = strlen(str);
-       for (i = len - 1; i >= 0; i--)
-               if (str[i] != ' ') break;
-       str[i+1] = 0;
+static const int *cfg_opt_counts[] =
+{
+       &opt_entry_count,
+       &opt2_entry_count,
+       &cdopt_entry_count,
+       &ctrlopt_entry_count,
+#ifdef PSP
+       &opt3_entry_count,
+#endif
+};
 
-       return str;
-}
+#define NL "\r\n"
 
 
 static int seek_sect(FILE *f, const char *section)
@@ -70,12 +86,20 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
        switch (me->id)
        {
                case MA_OPT_RENDERER:
-                       if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&0x10) &&
+                       if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&POPT_ALT_RENDERER) &&
                                !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&0x80)) return;
-                       if (PicoOpt&0x10)
-                               str = "8bit fast";
+                       if (PicoOpt&POPT_ALT_RENDERER)
+                               str =
+#ifndef PSP
+                               "8bit "
+#endif
+                               "fast";
                        else if (currentConfig.EmuOpt&0x80)
-                               str = "16bit accurate";
+                               str =
+#ifndef PSP
+                               "16bit "
+#endif
+                               "accurate";
                        else
                                str = "8bit accurate";
                        fprintf(f, "Renderer = %s", str);
@@ -83,6 +107,7 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
 
                case MA_OPT_SCALING:
                        if (no_def && defaultConfig.scaling == currentConfig.scaling) return;
+#ifdef __GP2X__
                        switch (currentConfig.scaling) {
                                default: str = "OFF"; break;
                                case 1:  str = "hw horizontal";     break;
@@ -90,6 +115,7 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
                                case 3:  str = "sw horizontal";     break;
                        }
                        fprintf(f, "Scaling = %s", str);
+#endif
                        break;
                case MA_OPT_FRAMESKIP:
                        if (no_def && defaultConfig.Frameskip == currentConfig.Frameskip) return;
@@ -99,15 +125,16 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
                        fprintf(f, "Frameskip = %s", str24);
                        break;
                case MA_OPT_SOUND_QUALITY:
-                       if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&8) &&
+                       if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&POPT_EN_STEREO) &&
                                defaultConfig.s_PsndRate == PsndRate) return;
-                       str = (PicoOpt&0x08)?"stereo":"mono";
+                       str = (PicoOpt&POPT_EN_STEREO)?"stereo":"mono";
                        fprintf(f, "Sound Quality = %i %s", PsndRate, str);
                        break;
                case MA_OPT_REGION:
                        if (no_def && defaultConfig.s_PicoRegion == PicoRegionOverride &&
                                defaultConfig.s_PicoAutoRgnOrder == PicoAutoRgnOrder) return;
-                       fprintf(f, "Region = %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));
+                       strncpy(str24, me_region_name(PicoRegionOverride, PicoAutoRgnOrder), 23); str24[23] = 0;
+                       fprintf(f, "Region = %s", mystrip(str24));
                        break;
                case MA_OPT_CONFIRM_STATES:
                        if (no_def && !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&(5<<9))) return;
@@ -121,7 +148,11 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
                        break;
                case MA_OPT_CPU_CLOCKS:
                        if (no_def && defaultConfig.CPUclock == currentConfig.CPUclock) return;
+#ifdef __GP2X__
                        fprintf(f, "GP2X CPU clocks = %i", currentConfig.CPUclock);
+#elif defined(PSP)
+                       fprintf(f, "PSP CPU clock = %i", currentConfig.CPUclock);
+#endif
                        break;
                case MA_OPT2_GAMMA:
                        if (no_def && defaultConfig.gamma == currentConfig.gamma) return;
@@ -136,6 +167,38 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
                        sprintf(str24, "%i", PicoCDBuffers * 2);
                        fprintf(f, "ReadAhead buffer = %s", str24);
                        break;
+               /* PSP */
+               case MA_OPT3_SCALE:
+                       if (no_def && defaultConfig.scale == currentConfig.scale) return;
+                       fprintf(f, "Scale factor = %.2f", currentConfig.scale);
+                       break;
+               case MA_OPT3_HSCALE32:
+                       if (no_def && defaultConfig.hscale32 == currentConfig.hscale32) return;
+                       fprintf(f, "Hor. scale (for low res. games) = %.2f", currentConfig.hscale32);
+                       break;
+               case MA_OPT3_HSCALE40:
+                       if (no_def && defaultConfig.hscale40 == currentConfig.hscale40) return;
+                       fprintf(f, "Hor. scale (for hi res. games) = %.2f", currentConfig.hscale40);
+                       break;
+               case MA_OPT3_FILTERING:
+                       if (no_def && defaultConfig.scaling == currentConfig.scaling) return;
+                       fprintf(f, "Bilinear filtering = %i", currentConfig.scaling);
+                       break;
+               case MA_OPT3_GAMMAA:
+                       if (no_def && defaultConfig.gamma == currentConfig.gamma) return;
+                       fprintf(f, "Gamma adjustment = %i", currentConfig.gamma);
+                       break;
+               case MA_OPT3_BLACKLVL:
+                       if (no_def && defaultConfig.gamma2 == currentConfig.gamma2) return;
+                       fprintf(f, "Black level = %i", currentConfig.gamma2);
+                       break;
+               case MA_OPT3_VSYNC:
+                       if (no_def && (defaultConfig.EmuOpt&0x12000) == (currentConfig.gamma2&0x12000)) return;
+                       strcpy(str24, "never");
+                       if (currentConfig.EmuOpt & 0x2000)
+                               strcpy(str24, (currentConfig.EmuOpt & 0x10000) ? "sometimes" : "always");
+                       fprintf(f, "Wait for vsync = %s", str24);
+                       break;
 
                default:
                        lprintf("unhandled custom_write: %i\n", me->id);
@@ -145,6 +208,7 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
 }
 
 
+#if PLAT_HAVE_JOY
 static const char *joyKeyNames[32] =
 {
        "UP", "DOWN", "LEFT", "RIGHT", "b1", "b2", "b3", "b4",
@@ -152,26 +216,40 @@ static const char *joyKeyNames[32] =
        "b13", "b14", "b15", "b16", "b17", "b19", "b19", "b20",
        "b21", "b22", "b23", "b24", "b25", "b26", "b27", "b28"
 };
+#endif
 
 static void keys_write(FILE *fn, const char *bind_str, const int binds[32],
-               const int def_binds[32], const char *names[32], int no_defaults)
+               const int def_binds[32], const char * const names[32], int key_count, int no_defaults)
 {
        int t, i;
-       char act[48];
+       char act[48], name[32];
 
-       for (t = 0; t < 32; t++)
+       for (t = 0; t < key_count; t++)
        {
                act[0] = act[31] = 0;
                if (no_defaults && binds[t] == def_binds[t])
                        continue;
-               if (strcmp(names[t], "???") == 0) continue;
 #ifdef __GP2X__
                if (strcmp(names[t], "SELECT") == 0) continue;
 #endif
+               if (t >= 32 || names[t] == NULL || strcmp(names[t], "???") == 0) {
+                       if ((t >= '0' && t <= '9') || (t >= 'a' && t <= 'z') || (t >= 'A' && t <= 'Z'))
+                               sprintf(name, "%c", t);
+                       else
+                               sprintf(name, "\\x%02x", t);
+               }
+               else
+                       strcpy(name, names[t]);
+
+               if (binds[t] == 0 && def_binds[t] != 0) {
+                       fprintf(fn, "%s %s =" NL, bind_str, name); // no binds
+                       continue;
+               }
+
                for (i = 0; i < sizeof(me_ctrl_actions) / sizeof(me_ctrl_actions[0]); i++) {
                        if (me_ctrl_actions[i].mask & binds[t]) {
                                strncpy(act, me_ctrl_actions[i].name, 31);
-                               fprintf(fn, "%s %s = player%i %s" NL, bind_str, names[t],
+                               fprintf(fn, "%s %s = player%i %s" NL, bind_str, name,
                                        ((binds[t]>>16)&1)+1, mystrip(act));
                        }
                }
@@ -179,7 +257,7 @@ static void keys_write(FILE *fn, const char *bind_str, const int binds[32],
                for (i = 0; emuctrl_actions[i].name != NULL; i++) {
                        if (emuctrl_actions[i].mask & binds[t]) {
                                strncpy(act, emuctrl_actions[i].name, 31);
-                               fprintf(fn, "%s %s = %s" NL, bind_str, names[t], mystrip(act));
+                               fprintf(fn, "%s %s = %s" NL, bind_str, name, mystrip(act));
                        }
                }
        }
@@ -216,6 +294,10 @@ static int default_var(const menu_entry *me)
                case MA_CDOPT_LEDS:
                        return defaultConfig.EmuOpt;
 
+               case MA_CTRL_TURBO_RATE: return defaultConfig.turbo_rate;
+               case MA_OPT_SCALING:     return defaultConfig.scaling;
+               case MA_OPT_ROTATION:    return defaultConfig.rotation;
+
                case MA_OPT_SAVE_SLOT:
                default:
                        return 0;
@@ -309,18 +391,25 @@ write:
                                if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask))
                                        fprintf(fn, "%s = %i" NL, me->name, (*(int *)me->var & me->mask) ? 1 : 0);
                        } else if (me->beh == MB_RANGE) {
-                               if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask))
+                               if (!no_defaults || (*(int *)me->var ^ default_var(me)))
                                        fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var);
                        }
                }
        }
 
        // save key config
-       keys_write(fn, "bind", currentConfig.KeyBinds, defaultConfig.KeyBinds, keyNames, no_defaults);
-       keys_write(fn, "bind_joy0", currentConfig.JoyBinds[0], defaultConfig.JoyBinds[0], joyKeyNames, 1);
-       keys_write(fn, "bind_joy1", currentConfig.JoyBinds[1], defaultConfig.JoyBinds[1], joyKeyNames, 1);
-       keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 1);
-       keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 1);
+       keys_write(fn, "bind", currentConfig.KeyBinds, defaultConfig.KeyBinds, keyNames, PLAT_MAX_KEYS, no_defaults);
+#if PLAT_HAVE_JOY
+       keys_write(fn, "bind_joy0", currentConfig.JoyBinds[0], defaultConfig.JoyBinds[0], joyKeyNames, 32, 1);
+       keys_write(fn, "bind_joy1", currentConfig.JoyBinds[1], defaultConfig.JoyBinds[1], joyKeyNames, 32, 1);
+       keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 32, 1);
+       keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 32, 1);
+#endif
+
+#ifndef PSP
+       if (section == NULL)
+               fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume);
+#endif
 
        fprintf(fn, NL);
 
@@ -350,7 +439,7 @@ int config_writelrom(const char *fname)
        int size;
        FILE *f;
 
-       if (strlen(lastRomFile) == 0) return 0;
+       if (strlen(loadedRomFName) == 0) return -1;
 
        f = fopen(fname, "r");
        if (f != NULL)
@@ -383,7 +472,7 @@ int config_writelrom(const char *fname)
                fwrite(old_data, 1, optr - old_data, f);
                free(old_data);
        }
-       fprintf(f, "LastUsedROM = %s" NL, lastRomFile);
+       fprintf(f, "LastUsedROM = %s" NL, loadedRomFName);
        fclose(f);
        return 0;
 }
@@ -414,9 +503,9 @@ int config_readlrom(const char *fname)
                tmp++;
                mystrip(tmp);
 
-               len = sizeof(lastRomFile);
-               strncpy(lastRomFile, tmp, len);
-               lastRomFile[len-1] = 0;
+               len = sizeof(loadedRomFName);
+               strncpy(loadedRomFName, tmp, len);
+               loadedRomFName[len-1] = 0;
                ret = 0;
                break;
        }
@@ -434,15 +523,15 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
        {
                case MA_OPT_RENDERER:
                        if (strcasecmp(var, "Renderer") != 0) return 0;
-                       if      (strcasecmp(val, "8bit fast") == 0) {
-                               PicoOpt |=  0x10;
+                       if      (strcasecmp(val, "8bit fast") == 0 || strcasecmp(val, "fast") == 0) {
+                               PicoOpt |=  POPT_ALT_RENDERER;
                        }
-                       else if (strcasecmp(val, "16bit accurate") == 0) {
-                               PicoOpt &= ~0x10;
+                       else if (strcasecmp(val, "16bit accurate") == 0 || strcasecmp(val, "accurate") == 0) {
+                               PicoOpt &= ~POPT_ALT_RENDERER;
                                currentConfig.EmuOpt |=  0x80;
                        }
                        else if (strcasecmp(val, "8bit accurate") == 0) {
-                               PicoOpt &= ~0x10;
+                               PicoOpt &= ~POPT_ALT_RENDERER;
                                currentConfig.EmuOpt &= ~0x80;
                        }
                        else
@@ -450,6 +539,7 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                        return 1;
 
                case MA_OPT_SCALING:
+#ifdef __GP2X__
                        if (strcasecmp(var, "Scaling") != 0) return 0;
                        if        (strcasecmp(val, "OFF") == 0) {
                                currentConfig.scaling = 0;
@@ -462,6 +552,9 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                        } else
                                return 0;
                        return 1;
+#else
+                       return 0;
+#endif
 
                case MA_OPT_FRAMESKIP:
                        if (strcasecmp(var, "Frameskip") != 0) return 0;
@@ -477,9 +570,9 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                                PsndRate = 22050;
                        while (*tmp == ' ') tmp++;
                        if        (strcasecmp(tmp, "stereo") == 0) {
-                               PicoOpt |=  8;
+                               PicoOpt |=  POPT_EN_STEREO;
                        } else if (strcasecmp(tmp, "mono") == 0) {
-                               PicoOpt &= ~8;
+                               PicoOpt &= ~POPT_EN_STEREO;
                        } else
                                return 0;
                        return 1;
@@ -537,7 +630,11 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                        return 1;
 
                case MA_OPT_CPU_CLOCKS:
+#ifdef __GP2X__
                        if (strcasecmp(var, "GP2X CPU clocks") != 0) return 0;
+#elif defined(PSP)
+                       if (strcasecmp(var, "PSP CPU clock") != 0) return 0;
+#endif
                        currentConfig.CPUclock = atoi(val);
                        return 1;
 
@@ -558,6 +655,44 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                        PicoCDBuffers = atoi(val) / 2;
                        return 1;
 
+               /* PSP */
+               case MA_OPT3_SCALE:
+                       if (strcasecmp(var, "Scale factor") != 0) return 0;
+                       currentConfig.scale = atof(val);
+                       return 1;
+               case MA_OPT3_HSCALE32:
+                       if (strcasecmp(var, "Hor. scale (for low res. games)") != 0) return 0;
+                       currentConfig.hscale32 = atof(val);
+                       return 1;
+               case MA_OPT3_HSCALE40:
+                       if (strcasecmp(var, "Hor. scale (for hi res. games)") != 0) return 0;
+                       currentConfig.hscale40 = atof(val);
+                       return 1;
+               case MA_OPT3_FILTERING:
+                       if (strcasecmp(var, "Bilinear filtering") != 0) return 0;
+                       currentConfig.scaling = atoi(val);
+                       return 1;
+               case MA_OPT3_GAMMAA:
+                       if (strcasecmp(var, "Gamma adjustment") != 0) return 0;
+                       currentConfig.gamma = atoi(val);
+                       return 1;
+               case MA_OPT3_BLACKLVL:
+                       if (strcasecmp(var, "Black level") != 0) return 0;
+                       currentConfig.gamma2 = atoi(val);
+                       return 1;
+               case MA_OPT3_VSYNC:
+                       if (strcasecmp(var, "Wait for vsync") != 0) return 0;
+                       if        (strcasecmp(val, "never") == 0) {
+                               currentConfig.EmuOpt &= ~0x12000;
+                       } else if (strcasecmp(val, "sometimes") == 0) {
+                               currentConfig.EmuOpt |=  0x12000;
+                       } else if (strcasecmp(val, "always") == 0) {
+                               currentConfig.EmuOpt &= ~0x12000;
+                               currentConfig.EmuOpt |=  0x02000;
+                       } else
+                               return 0;
+                       return 1;
+
                default:
                        lprintf("unhandled custom_read: %i\n", me->id);
                        return 0;
@@ -567,21 +702,35 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 
 static unsigned int keys_encountered = 0;
 
-static void keys_parse(const char *var, const char *val, int binds[32], const char *names[32])
+static void keys_parse(const char *var, const char *val, int binds[32],
+       const char * const names[32], int max_keys)
 {
        int t, i;
        unsigned int player;
 
        for (t = 0; t < 32; t++)
        {
-               if (strcmp(names[t], var) == 0) break;
+               if (names[t] && strcmp(names[t], var) == 0) break;
+       }
+       if (t == 32)
+       {
+               int len = strlen(var);
+               if (len == 1) t = var[0];
+               else if (len >= 4 && var[0] == '\\' && var[1] == 'x') {
+                       char *p;
+                       t = (int)strtoul(var + 2, &p, 16);
+                       if (*p != 0) t = max_keys; // parse failed
+               }
+               else
+                       t = max_keys; // invalid
        }
-       if (t == 32) {
+       if (t < 0 || t >= max_keys) {
                lprintf("unhandled bind \"%s\"\n", var);
                return;
        }
 
-       if (binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) { // hack
+       // unbind old, but only when key is first encountered
+       if (t < 32 && binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) {
                binds[t] = 0;
                keys_encountered |= 1<<t;
        }
@@ -613,7 +762,7 @@ fail:
 
 #define try_joy_parse(num) { \
        if (strncasecmp(var, "bind_joy"#num " ", 10) == 0) { \
-               keys_parse(var + 10, val, currentConfig.JoyBinds[num], joyKeyNames); \
+               keys_parse(var + 10, val, currentConfig.JoyBinds[num], joyKeyNames, 32); \
                return; \
        } \
 }
@@ -626,15 +775,22 @@ static void parse(const char *var, const char *val)
        if (strcasecmp(var, "LastUsedROM") == 0)
                return; /* handled elsewhere */
 
+       if (strcasecmp(var, "Sound Volume") == 0) {
+               currentConfig.volume = atoi(val);
+               return;
+       }
+
        // key binds
        if (strncasecmp(var, "bind ", 5) == 0) {
-               keys_parse(var + 5, val, currentConfig.KeyBinds, keyNames);
+               keys_parse(var + 5, val, currentConfig.KeyBinds, keyNames, PLAT_MAX_KEYS);
                return;
        }
+#if PLAT_HAVE_JOY
        try_joy_parse(0)
        try_joy_parse(1)
        try_joy_parse(2)
        try_joy_parse(3)
+#endif
 
        for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]) && ret == 0; t++)
        {
@@ -661,7 +817,7 @@ static void parse(const char *var, const char *val)
                        ret = custom_read(me, var, val);
                }
        }
-       if (!ret) lprintf("config_readsect: unhandled var: %s\n", var);
+       if (!ret) lprintf("config_readsect: unhandled var: \"%s\"\n", var);
 }
 
 
@@ -678,15 +834,14 @@ int config_havesect(const char *fname, const char *section)
        return ret;
 }
 
-
 int config_readsect(const char *fname, const char *section)
 {
-       char line[128], *var, *val, *tmp;
-       int len, i, ret;
+       char line[128], *var, *val;
        FILE *f;
+       int ret;
 
        f = fopen(fname, "r");
-       if (f == NULL) return 0;
+       if (f == NULL) return -1;
 
        if (section != NULL)
        {
@@ -702,35 +857,9 @@ int config_readsect(const char *fname, const char *section)
 
        while (!feof(f))
        {
-               tmp = fgets(line, sizeof(line), f);
-               if (tmp == NULL) break;
-
-               if (line[0] == '[') break; // other section
-
-               // strip comments, linefeed, spaces..
-               len = strlen(line);
-               for (i = 0; i < len; i++)
-                       if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
-               mystrip(line);
-               len = strlen(line);
-               if (len <= 0) continue;
-
-               // get var and val
-               for (i = 0; i < len; i++)
-                       if (line[i] == '=') break;
-               if (i >= len || strchr(&line[i+1], '=') != NULL) {
-                       lprintf("config_readsect: can't parse: %s\n", line);
-                       continue;
-               }
-               line[i] = 0;
-               var = line;
-               val = &line[i+1];
-               mystrip(var);
-               mystrip(val);
-               if (strlen(var) == 0 || (strlen(val) == 0 && strncasecmp(var, "bind", 4) != 0)) {
-                       lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
-                       continue;
-               }
+               ret = config_get_var_val(f, line, sizeof(line), &var, &val);
+               if (ret ==  0) break;
+               if (ret == -1) continue;
 
                parse(var, val);
        }
@@ -739,3 +868,71 @@ int config_readsect(const char *fname, const char *section)
        return 0;
 }
 
+#endif // _MSC_VER
+
+static char *mystrip(char *str)
+{
+       int i, len;
+
+       len = strlen(str);
+       for (i = 0; i < len; i++)
+               if (str[i] != ' ') break;
+       if (i > 0) memmove(str, str + i, len - i + 1);
+
+       len = strlen(str);
+       for (i = len - 1; i >= 0; i--)
+               if (str[i] != ' ') break;
+       str[i+1] = 0;
+
+       return str;
+}
+
+/* returns:
+ *  0 - EOF, end
+ *  1 - parsed ok
+ * -1 - failed to parse line
+ */
+int config_get_var_val(void *file, char *line, int lsize, char **rvar, char **rval)
+{
+       char *var, *val, *tmp;
+       FILE *f = file;
+       int len, i;
+
+       tmp = fgets(line, lsize, f);
+       if (tmp == NULL) return 0;
+
+       if (line[0] == '[') return 0; // other section
+
+       // strip comments, linefeed, spaces..
+       len = strlen(line);
+       for (i = 0; i < len; i++)
+               if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
+       mystrip(line);
+       len = strlen(line);
+       if (len <= 0) return -1;;
+
+       // get var and val
+       for (i = 0; i < len; i++)
+               if (line[i] == '=') break;
+       if (i >= len || strchr(&line[i+1], '=') != NULL) {
+               lprintf("config_readsect: can't parse: %s\n", line);
+               return -1;
+       }
+       line[i] = 0;
+       var = line;
+       val = &line[i+1];
+       mystrip(var);
+       mystrip(val);
+
+#ifndef _MSC_VER
+       if (strlen(var) == 0 || (strlen(val) == 0 && strncasecmp(var, "bind", 4) != 0)) {
+               lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
+               return -1;;
+       }
+#endif
+
+       *rvar = var;
+       *rval = val;
+       return 1;
+}
+