notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

options working fairly well

Browse source
This commit is contained in:
Albert Cahalan 2009-11-23 07:45:24 +00:00
parent f3441070e8
commit e3a971194c
12 changed files with 152 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/get_fname.c
View file

@ -28,18 +28,7 @@
#include "get_fname.h"
#include "debug.h"
char *savedir;
char *datadir;
/* The filename for the current image: */
char *get_fname(const char *const name, int kind)
{
char f[512];
char * dir;
#include "compiler.h"
/* DIR_SAVE: Where is the user's saved directory?
This is where their saved files are stored
@ -58,43 +47,23 @@ char *get_fname(const char *const name, int kind)
DIR_DATA: Where is the user's data directory?
This is where local fonts, brushes and stamps can be found. */
if (kind == DIR_SAVE)
dir = savedir;
else if (kind == DIR_DATA)
dir = datadir;
else
return NULL;
const char *savedir;
const char *datadir;
#ifdef WIN32
snprintf(f, sizeof(f), "%s/%s", dir, name);
#elif __BEOS__
if (*name == '\0')
strcpy(f, dir);
else
snprintf(f, sizeof(f), "%s/%s", dir, name);
#endif
// FIXME: We shouldn't be allocating memory all the time.
// There should be distinct functions for each directory.
// There should be distinct functions for each thread,
// for caller-provided space, and maybe callee strdup.
// That's at most 4 functions per Tux Paint thread.
char *get_fname(const char *const name, int kind)
{
char f[512];
const char *restrict const dir = (kind==DIR_SAVE) ? savedir : datadir;
/* Put together home directory path + settings directory + filename... */
if (dir == NULL)
{
fprintf(stderr, "Warning: get_fname() has a NULL dir...!?\n");
return strdup(name);;
}
if (*name != '\0')
{
/* (Some mkdir()'s don't like trailing slashes) */
snprintf(f, sizeof(f), "%s/%s", dir, name);
}
else
{
snprintf(f, sizeof(f), "%s", dir);
}
// Some mkdir()'s don't like trailing slashes
snprintf(f, sizeof(f), "%s%c%s", dir, (*name)?'/':'\0', name);
return strdup(f);
}