--- uae/src/cfgfile.c	2018/04/24 16:47:29	1.1.1.3
+++ uae/src/cfgfile.c	2018/04/24 16:53:03	1.1.1.5
@@ -95,6 +95,7 @@ static const char *centermode2[] = { "fa
 static const char *stereomode1[] = { "mono", "stereo", 0 };
 static const char *stereomode2[] = { "m", "s", 0 };
 static const char *stereomode3[] = { "1", "2", 0 };
+static const char *interpolmode[] = { "none", "rh", "crux", 0 };
 
 #define UNEXPANDED "$(FILE_PATH)"
 
@@ -166,6 +167,7 @@ void save_options (FILE *f, struct uae_p
     fprintf (f, "sound_min_buff=%d\n", p->sound_minbsiz);
     fprintf (f, "sound_max_buff=%d\n", p->sound_maxbsiz);
     fprintf (f, "sound_frequency=%d\n", p->sound_freq);
+    fprintf (f, "sound_interpol=%s\n", interpolmode[p->sound_interpol]);
 
     fprintf (f, "sound_pri_time=%d\n", p->sound_pri_time);
     fprintf (f, "sound_pri_cutoff=%d\n", p->sound_pri_cutoff);
@@ -311,6 +313,15 @@ static int getintval (char **p, int *res
     return 1;
 }
 
+static int set_chipset_mask (struct uae_prefs *p, int val)
+{
+    p->chipset_mask = (val == 0 ? 0
+		       : val == 1 ? CSMASK_ECS_AGNUS
+		       : val == 2 ? CSMASK_ECS_DENISE
+		       : val == 3 ? CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS
+		       : CSMASK_AGA | CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS);
+}
+
 int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value)
 {
     int tmpval;
@@ -373,6 +384,7 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode1, 1)
 	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode2, 1)
 	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode3, 0)
+	|| cfgfile_strval (option, value, "sound_interpol", &p->sound_interpol, interpolmode, 0)
 	|| cfgfile_strval (option, value, "joyport0", &p->jport0, portmode, 0)
 	|| cfgfile_strval (option, value, "joyport1", &p->jport1, portmode, 0)
 	|| cfgfile_strval (option, value, "gfx_linemode", &p->gfx_linedbl, linemode1, 1)
@@ -397,11 +409,7 @@ int cfgfile_parse_option (struct uae_pre
 
     /* Tricky ones... */
     if (cfgfile_strval (option, value, "chipset", &tmpval, csmode, 0)) {
-	p->chipset_mask = (tmpval == 0 ? 0
-			   : tmpval == 1 ? CSMASK_ECS_AGNUS
-			   : tmpval == 2 ? CSMASK_ECS_DENISE
-			   : tmpval == 3 ? CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS
-			   : CSMASK_AGA | CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS);
+	set_chipset_mask (p, tmpval);
 	return 1;
     }
 	
@@ -539,7 +547,7 @@ int cfgfile_load (struct uae_prefs *p, c
     FILE *fh;
     char line[256];
 
-    fh = fopen (filename, "rt");
+    fh = fopen (filename, "r");
     if (! fh)
 	return 0;
 
@@ -591,3 +599,334 @@ void cfgfile_show_usage (void)
     for (i = 0; i < sizeof opttable / sizeof *opttable; i++)
 	fprintf (stderr, "%s: %s\n", opttable[i].config_label, opttable[i].config_help);
 }
+
+/* This implements the old commandline option parsing.  I've re-added this
+   because the new way of doing things is painful for me (it requires me
+   to type a couple hundred characters when invoking UAE).  The following
+   is far less annoying to use.  */
+static void parse_gfx_specs (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2;
+
+    x1 = strchr (x0, ':');
+    if (x1 == 0)
+	goto argh;
+    x2 = strchr (x1+1, ':');
+    if (x2 == 0)
+	goto argh;
+    *x1++ = 0; *x2++ = 0;
+
+    currprefs.gfx_width = atoi (x0);
+    currprefs.gfx_height = atoi (x1);
+    currprefs.gfx_lores = strchr (x2, 'l') != 0;
+    currprefs.gfx_xcenter = strchr (x2, 'x') != 0 ? 1 : strchr (x2, 'X') != 0 ? 2 : 0;
+    currprefs.gfx_ycenter = strchr (x2, 'y') != 0 ? 1 : strchr (x2, 'Y') != 0 ? 2 : 0;
+    currprefs.gfx_linedbl = strchr (x2, 'd') != 0;
+    currprefs.gfx_linedbl += 2 * (strchr (x2, 'D') != 0);
+    currprefs.gfx_afullscreen = strchr (x2, 'a') != 0;
+    currprefs.gfx_pfullscreen = strchr (x2, 'p') != 0;
+    currprefs.gfx_correct_aspect = strchr (x2, 'c') != 0;
+
+    if (currprefs.gfx_linedbl == 3) {
+	fprintf (stderr, "You can't use both 'd' and 'D' modifiers in the display mode specification.\n");
+    }
+    
+    free (x0);
+    return;
+
+    argh:
+    fprintf (stderr, "Bad display mode specification.\n");
+    fprintf (stderr, "The format to use is: \"width:height:modifiers\"\n");
+    fprintf (stderr, "Type \"uae -h\" for detailed help.\n");
+    free (x0);
+}
+
+static void parse_sound_spec (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2 = NULL, *x3 = NULL, *x4 = NULL, *x5 = NULL;
+
+    x1 = strchr (x0, ':');
+    if (x1 != NULL) {
+	*x1++ = '\0';
+	x2 = strchr (x1 + 1, ':');
+	if (x2 != NULL) {
+	    *x2++ = '\0';
+	    x3 = strchr (x2 + 1, ':');
+	    if (x3 != NULL) {
+		*x3++ = '\0';
+		x4 = strchr (x3 + 1, ':');
+		if (x4 != NULL) {
+		    *x4++ = '\0';
+		    x5 = strchr (x4 + 1, ':');
+		}
+	    }
+	}
+    }
+    currprefs.produce_sound = atoi (x0);
+    if (x1) {
+	if (*x1 == 's')
+	    currprefs.stereo = 1;
+	else
+	    currprefs.stereo = 0;
+    }
+    if (x2)
+	currprefs.sound_bits = atoi (x2);
+    if (x3)
+	currprefs.sound_freq = atoi (x3);
+    if (x4)
+	currprefs.sound_maxbsiz = currprefs.sound_minbsiz = atoi (x4);
+    if (x5)
+	currprefs.sound_minbsiz = atoi (x5);
+    free (x0);
+    return;
+}
+
+
+static void parse_joy_spec (char *spec)
+{
+    int v0 = 2, v1 = 0;
+    if (strlen(spec) != 2)
+	goto bad;
+
+    switch (spec[0]) {
+     case '0': v0 = 0; break;
+     case '1': v0 = 1; break;
+     case 'M': case 'm': v0 = 2; break;
+     case 'A': case 'a': v0 = 3; break;
+     case 'B': case 'b': v0 = 4; break;
+     case 'C': case 'c': v0 = 5; break;
+     default: goto bad;
+    }
+
+    switch (spec[1]) {
+     case '0': v1 = 0; break;
+     case '1': v1 = 1; break;
+     case 'M': case 'm': v1 = 2; break;
+     case 'A': case 'a': v1 = 3; break;
+     case 'B': case 'b': v1 = 4; break;
+     case 'C': case 'c': v1 = 5; break;
+     default: goto bad;
+    }
+    if (v0 == v1)
+	goto bad;
+    /* Let's scare Pascal programmers */
+    if (0)
+bad:
+    fprintf (stderr, "Bad joystick mode specification. Use -J xy, where x and y\n"
+	     "can be 0 for joystick 0, 1 for joystick 1, M for mouse, and\n"
+	     "a, b or c for different keyboard settings.\n");
+
+    currprefs.jport0 = v0;
+    currprefs.jport1 = v1;
+}
+
+static void parse_filesys_spec (int readonly, char *spec)
+{
+    char buf[256];
+    char *s2;
+
+    strncpy (buf, spec, 255); buf[255] = 0;
+    s2 = strchr (buf, ':');
+    if (s2) {
+	*s2++ = '\0';
+#ifdef __DOS__
+	{
+	    char *tmp;
+ 
+	    while ((tmp = strchr (s2, '\\')))
+		*tmp = '/';
+	}
+#endif
+	s2 = add_filesys_unit (currprefs.mountinfo, buf, s2, readonly, 0, 0, 0, 0);
+	if (s2)
+	    fprintf (stderr, "%s\n", s2);
+    } else {
+	fprintf (stderr, "Usage: [-m | -M] VOLNAME:mount_point\n");
+    }
+}
+ 
+static void parse_hardfile_spec (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2, *x3, *x4;
+
+    x1 = strchr (x0, ':');
+    if (x1 == NULL)
+	goto argh;
+    *x1++ = '\0';
+    x2 = strchr (x1 + 1, ':');
+    if (x2 == NULL)
+	goto argh;
+    *x2++ = '\0';
+    x3 = strchr (x2 + 1, ':');
+    if (x3 == NULL)
+	goto argh;
+    *x3++ = '\0';
+    x4 = strchr (x3 + 1, ':');
+    if (x4 == NULL)
+	goto argh;
+    *x4++ = '\0';
+    x4 = add_filesys_unit (currprefs.mountinfo, 0, x4, 0, atoi (x0), atoi (x1), atoi (x2), atoi (x3));
+    if (x4)
+	fprintf (stderr, "%s\n", x4);
+
+    free (x0);
+    return;
+
+ argh:
+    free (x0);
+    fprintf (stderr, "Bad hardfile parameter specified - type \"uae -h\" for help.\n");
+    return;
+}
+
+static void parse_cpu_specs (char *spec)
+{
+    if (*spec < '0' || *spec > '3') {
+	fprintf (stderr, "CPU parameter string must begin with '0', '1', '2' or '3'.\n");
+	return;
+    }
+	
+    currprefs.cpu_level = *spec++ - '0';
+    currprefs.address_space_24 = currprefs.cpu_level < 2;
+    currprefs.cpu_compatible = 0;
+    while (*spec != '\0') {
+	switch (*spec) {
+	 case 'a':
+	    if (currprefs.cpu_level < 2)
+		fprintf (stderr, "In 68000/68010 emulation, the address space is always 24 bit.\n");
+	    else
+		currprefs.address_space_24 = 1;
+	    break;
+	 case 'c':
+	    if (currprefs.cpu_level != 0)
+		fprintf (stderr, "The more compatible CPU emulation is only available for 68000\n"
+			 "emulation, not for 68010 upwards.\n");
+	    else
+		currprefs.cpu_compatible = 1;
+	    break;
+	 default:
+	    fprintf (stderr, "Bad CPU parameter specified - type \"uae -h\" for help.\n");
+	    break;
+	}
+	spec++;
+    }
+}
+
+/* Returns the number of args used up (0 or 1).  */
+int parse_cmdline_option (char c, char *arg)
+{
+    const char arg_required[] = "0123rKpImWSAJwNCZUFcblOdHRv";
+
+    if (strchr (arg_required, c) && ! arg) {
+	fprintf (stderr, "Missing argument for option `-%c'!\n", c);
+	return 0;
+    }
+
+    switch (c) {
+    case 'h': usage (); exit (0);
+
+    case '0': strncpy (currprefs.df[0], arg, 255); currprefs.df[0][255] = 0; break;
+    case '1': strncpy (currprefs.df[1], arg, 255); currprefs.df[1][255] = 0; break;
+    case '2': strncpy (currprefs.df[2], arg, 255); currprefs.df[2][255] = 0; break;
+    case '3': strncpy (currprefs.df[3], arg, 255); currprefs.df[3][255] = 0; break;
+    case 'r': strncpy (currprefs.romfile, arg, 255); currprefs.romfile[255] = 0; break;
+    case 'K': strncpy (currprefs.keyfile, arg, 255); currprefs.keyfile[255] = 0; break;
+    case 'p': strncpy (currprefs.prtname, arg, 255); currprefs.prtname[255] = 0; break;
+	/*     case 'I': strncpy (currprefs.sername, arg, 255); currprefs.sername[255] = 0; currprefs.use_serial = 1; break; */
+    case 'm': case 'M': parse_filesys_spec (c == 'M', arg); break;
+    case 'W': parse_hardfile_spec (arg); break;
+    case 'S': parse_sound_spec (arg); break;
+    case 'R': currprefs.gfx_framerate = atoi (arg); break;
+    case 'A': currprefs.emul_accuracy = atoi (arg); break;
+    case 'x': currprefs.no_xhair = 1; break;
+    case 'i': currprefs.illegal_mem = 1; break;
+    case 'J': parse_joy_spec (arg); break;
+    case 'a': currprefs.automount_uaedev = 0; break;
+
+    case 't': currprefs.test_drawing_speed = 1; break;
+    case 'L': currprefs.x11_use_low_bandwidth = 1; break;
+    case 'T': currprefs.x11_use_mitshm = 1; break;
+    case 'w': currprefs.m68k_speed = atoi (arg); break;
+
+	/* case 'g': currprefs.use_gfxlib = 1; break; */
+    case 'G': currprefs.start_gui = 0; break;
+    case 'D': currprefs.start_debugger = 1; break;
+
+    case 'n':
+	if (strchr (arg, '3') != 0)
+	    currprefs.blits_32bit_enabled = 1;
+	if (strchr (arg, 'i') != 0)
+	    currprefs.immediate_blits = 1;
+	break;
+
+    case 'v':
+	set_chipset_mask (&currprefs, atoi (arg));
+	break;
+
+    case 'C':
+	parse_cpu_specs (arg);
+	break;
+
+    case 'Z':
+	currprefs.z3fastmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'U':
+	currprefs.gfxmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'F':
+	currprefs.fastmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'b':
+	currprefs.bogomem_size = atoi (arg) * 0x40000;
+	break;
+
+    case 'c':
+	currprefs.chipmem_size = atoi (arg) * 0x80000;
+	break;
+
+    case 'l':
+	if (0 == strcasecmp(arg, "de"))
+	    currprefs.keyboard_lang = KBD_LANG_DE;
+	else if (0 == strcasecmp(arg, "us"))
+	    currprefs.keyboard_lang = KBD_LANG_US;
+	else if (0 == strcasecmp(arg, "se"))
+	    currprefs.keyboard_lang = KBD_LANG_SE;
+	else if (0 == strcasecmp(arg, "fr"))
+	    currprefs.keyboard_lang = KBD_LANG_FR;
+	else if (0 == strcasecmp(arg, "it"))
+	    currprefs.keyboard_lang = KBD_LANG_IT;
+	else if (0 == strcasecmp(arg, "es"))
+	    currprefs.keyboard_lang = KBD_LANG_ES;
+	break;
+
+    case 'O': parse_gfx_specs (arg); break;
+    case 'd':
+	if (strchr (arg, 'S') != NULL || strchr (arg, 's')) {
+	    write_log ("  Serial on demand.\n");
+	    currprefs.serial_demand = 1;
+	}
+	if (strchr (arg, 'P') != NULL || strchr (arg, 'p')) {
+	    write_log ("  Parallel on demand.\n");
+	    currprefs.parallel_demand = 1;
+	}
+
+	break;
+
+    case 'H':
+	currprefs.color_mode = atoi (arg);
+	if (currprefs.color_mode < 0) {
+	    fprintf (stderr, "Bad color mode selected. Using default.\n");
+	    currprefs.color_mode = 0;
+	}
+	break;
+    default:
+	fprintf (stderr, "Unknown option `-%c'!\n", c);
+	break;
+    }
+    return !! strchr (arg_required, c);
+}