Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.31
diff -u -r1.31 srv_main.c
--- srv_main.c	2001/02/24 18:37:01	1.31
+++ srv_main.c	2001/02/25 23:09:25
@@ -774,7 +774,12 @@
   struct section_file file;
   struct timer *timer_cpu, *timer_user;
 
-  sz_strlcpy(filename, orig_filename);
+  if (orig_filename != NULL && orig_filename[0] != '\0'){
+    sz_strlcpy(filename, orig_filename);
+  } else { /* If orig_filename is NULL or empty, use "civgame<year>m.sav" */
+    my_snprintf(filename, sizeof(filename),
+		"%s%dm.sav", game.save_name, game.year);
+  }
   
   timer_cpu = new_timer_start(TIMER_CPU, TIMER_ACTIVE);
   timer_user = new_timer_start(TIMER_USER, TIMER_ACTIVE);
Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.173
diff -u -r1.173 stdinhand.c
--- stdinhand.c	2001/02/19 23:37:54	1.173
+++ stdinhand.c	2001/02/25 23:09:32
@@ -1066,10 +1066,13 @@
   },
   {"save",	ALLOW_HACK,
    /* TRANS: translate text between <> only */
-   N_("save <file-name>"),
+   N_("save\n"
+      "save <file-name>"),
    N_("Save game to file."),
-   N_("Save the current game to a file.  To reload a savegame created "
-      "by 'save', start the server with the command-line argument:\n"
+   N_("Save the current game to file <file-name>.  If no file-name "
+      "argument is given saves to \"<auto-save name prefix><year>m.sav[.gz]\". "
+      "To reload a savegame created by 'save', start the server with "
+      "the command-line argument:\n"
       "    --file <filename>\n"
       "and use the 'start' command once players have reconnected.")
   },