luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The archiver now uses a predictable file order when creating an archive.

Browse Source 
[ARCHIVER]
* BUG: The archiver now uses a predictable file order when creating an archive.
This commit is contained in:
gambas 2017-11-19 02:29:59 +01:00
parent a71bfa4932
commit 39f93ddb37
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
main/gbc/gba.c
View File

@ -227,8 +227,9 @@ static int path_count(void)
int main(int argc, char **argv)
{
DIR *dir;
const char *path;
int nfile;
struct dirent **filelist;
struct dirent *dirent;
char *file_name;
const char *file;
@ -240,6 +241,7 @@ int main(int argc, char **argv)
const char **remove_ext;
ARCH *arch;
ARCH_FIND find;
int i;
get_arguments(argc, argv);
COMMON_init();
@ -279,22 +281,26 @@ int main(int argc, char **argv)
break;
path = path_list[path_current++];
dir = opendir(path);
if (dir == NULL)
{
fprintf(stderr, "gba: warning: Cannot open dir: %s\n", path);
goto _NEXT_PATH;
}
if (chdir(path) != 0)
{
fprintf(stderr, "gba: warning: Cannot change dir: %s\n", path);
fprintf(stderr, "gba: warning: cannot change to directory: %s\n", path);
goto _NEXT_PATH;
}
while ((dirent = readdir(dir)) != NULL)
filelist = NULL;
nfile = scandir(path, &filelist, NULL, alphasort);
if (nfile < 0)
{
fprintf(stderr, "gba: warning: cannot scan directory: %s\n", path);
goto _NEXT_PATH;
}
for (i = 0; i < nfile; i++)
{
dirent = filelist[i];
file_name = dirent->d_name;
len = strlen(file_name);
@ -381,7 +387,9 @@ int main(int argc, char **argv)
}
_NEXT_PATH:
if (dir != NULL) closedir(dir);
if (filelist != NULL)
free(filelist);
FREE((char **)&path);
}