Make sure file_name contains '/' between SAVEDIR and the file name.

Duplicated slashes are not a problem.  Missing slashes are.
This commit is contained in:
John "Elwin" Edwards 2013-08-27 22:25:40 -07:00
parent 5a25cd89da
commit 1f1ae55a26
4 changed files with 4 additions and 4 deletions

View file

@ -64,7 +64,7 @@ char **envp;
use_savedir = TRUE;
strncpy(whoami, argv[2], LINELEN);
whoami[LINELEN - 1] = '\0';
if (snprintf(file_name, LINELEN, "%s%d-%.10s.ar5sav", SAVEDIR,
if (snprintf(file_name, LINELEN, "%s/%d-%.10s.ar5sav", SAVEDIR,
md_getuid(), whoami) >= LINELEN)
{
/* The name is too long */

View file

@ -71,7 +71,7 @@ char **envp;
whoami[79] = '\0';
use_savedir = TRUE;
/* look for savefile at SAVEDIR/UID-playername.r3sav */
if (snprintf(file_name, 80, "%s%d-%.10s.r3sav", SAVEDIR, md_getuid(), whoami) >= 80)
if (snprintf(file_name, 80, "%s/%d-%.10s.r3sav", SAVEDIR, md_getuid(), whoami) >= 80)
{
/* this shouldn't happen */
strcpy(file_name, "rogue3.save");

View file

@ -78,7 +78,7 @@ char **envp;
whoami[MAXSTR - 1] = '\0'; /* insurance */
use_savedir = TRUE;
/* look for savefile at SAVEDIR/UID-playername.r4sav */
if (snprintf(file_name, MAXSTR, "%s%d-%.10s.r4sav", SAVEDIR,
if (snprintf(file_name, MAXSTR, "%s/%d-%.10s.r4sav", SAVEDIR,
md_getuid(), whoami) >= MAXSTR)
{
/* Name is too long- this shouldn't happen */

View file

@ -120,7 +120,7 @@ char **envp;
strncpy(whoami, argv[2], LINLEN);
whoami[LINLEN - 1] = '\0';
use_savedir = TRUE;
if (snprintf(file_name, LINLEN, "%s%d-%.10s.srsav", SAVEDIR,
if (snprintf(file_name, LINLEN, "%s/%d-%.10s.srsav", SAVEDIR,
playuid, whoami) >= LINLEN) {
/* Just in case it doesn't fit */
strcpy(file_name, "srogue.save");