thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Tons of cleanup

Browse source 
svn-id: r38721
This commit is contained in:
Max Horn 2009-02-21 18:39:53 +00:00
parent 0d41ca8d38
commit 9f2c0dcc6f
10 changed files with 55 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

36
engines/sci/tools.cpp
View file

@ -37,6 +37,7 @@
#ifdef UNIX
#include <fnmatch.h>
#include <sys/stat.h>
#endif
#include "common/archive.h"
@ -315,41 +316,6 @@ void sci_finish_find(sci_dir_t *dir) {
#endif
int sci_mkpath(const char *path) {
const char *path_position = path;
char *next_separator = NULL;
if (chdir(G_DIR_SEPARATOR_S)) { // Go to root
sciprintf("Error: Could not change to root directory '%s'", G_DIR_SEPARATOR_S);
return -1;
}
do {
if (next_separator)
*next_separator = G_DIR_SEPARATOR_S[0];
next_separator = (char *)strchr(path_position, G_DIR_SEPARATOR_S[0]);
if (next_separator)
*next_separator = 0;
if (*path_position) { // Unless we're at the first slash...
if (chdir(path_position)) {
if (scimkdir(path_position, 0700) || chdir(path_position)) {
sciprintf("Error: Could not create subdirectory '%s' in", path_position);
if (next_separator)
*next_separator = G_DIR_SEPARATOR_S[0];
sciprintf(" '%s'!\n", path);
return -2;
}
}
}
path_position = next_separator + 1;
} while (next_separator);
return 0;
}
/* Returns the case-sensitive filename of a file.
** Expects *dir to be uninitialized and the caller to free it afterwards.