Merged gnrfan patches fixing issues 191, 193, 194

diff --cc redis.c
index e3afa53e81e01bf94e067d0a399ac82d67ccea1e,3e07c5fb5e83cee008f3e7f514bf9271bf510b3d..ec74c0018d6dd6fd6ae9dc41f8461976c0776e85
--- 1/redis.c
--- 2/redis.c
+++ b/redis.c
@@@ -9163,24 -9127,23 +9165,28 @@@ static void daemonize(void) 
      }
  }
  
 +static void version() {
 +    printf("Redis server version %s\n", REDIS_VERSION);
 +    exit(0);
 +}
 +
+ static void usage() {
+     fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
+     exit(1);
+ }
+ 
  int main(int argc, char **argv) {
      time_t start;
  
      initServerConfig();
      if (argc == 2) {
-         if ((strcmp(argv[1], "-v") == 0) || (strcmp(argv[1], "--version") == 0)) {
-             version();
 -        if (strcmp(argv[1], "--help") == 0) {
 -            usage();
--        }
++        if (strcmp(argv[1], "-v") == 0 ||
++            strcmp(argv[1], "--version") == 0) version();
++        if (strcmp(argv[1], "--help") == 0) usage();
          resetServerSaveParams();
          loadServerConfig(argv[1]);
-     } else if (argc > 2) {
-         fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
-         exit(1);
+     } else if ((argc > 2)) {
+         usage();
      } else {
          redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'");
      }