Merge branch 'master' into dev

README.md

@@ -32,6 +32,13 @@ Other useful options:
         -P   --proxy           Proxy for libcurl, for more details refer to
 				https://curl.haxx.se/libcurl/c/CURLOPT_PROXY.html
 
+## Configuration file support
+There is now rudimentary config file support. The configuration file that the program will read is ``${HOME}/.httpdirfs/config``. You will have to create the sub-directory and the configuration file yourself. In the configuration file, please supply one option per line. For example: 
+
+	$ cat ${HOME}/.httpdirfs/config
+	--username test
+	--password test
+	-f
 
 ## SSL Support
 

main.c

@@ -157,10 +157,10 @@ parse_arg_list(int argc, char **argv, char ***fuse_argv, int *fuse_argc)
             case 's':
                 add_arg(fuse_argv, fuse_argc, "-s");
                 break;
-            case 'p':
+            case 'u':
                 NETWORK_CONFIG.username = strndup(optarg, ARG_LEN_MAX);
                 break;
-            case 'u':
+            case 'p':
                 NETWORK_CONFIG.password = strndup(optarg, ARG_LEN_MAX);
                 break;
             case 'P':