Cleanups.
committer: mfx <mfx> 1034748563 +0000
This commit is contained in:
+7
-7
@@ -411,7 +411,7 @@ bool file_exists(const char *name)
|
|||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
||||||
/* return true if we can open it */
|
/* return true if we can open it */
|
||||||
fd = open(name, O_RDONLY);
|
fd = open(name, O_RDONLY, 0);
|
||||||
if (fd >= 0)
|
if (fd >= 0)
|
||||||
{
|
{
|
||||||
(void) close(fd);
|
(void) close(fd);
|
||||||
@@ -440,7 +440,7 @@ bool maketempname(char *ofilename, size_t size,
|
|||||||
const char *ifilename, const char *ext, bool force)
|
const char *ifilename, const char *ext, bool force)
|
||||||
{
|
{
|
||||||
char *ofext = NULL, *ofname;
|
char *ofext = NULL, *ofname;
|
||||||
int ofile = -1;
|
int ofile;
|
||||||
|
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
return false;
|
return false;
|
||||||
@@ -455,14 +455,14 @@ bool maketempname(char *ofilename, size_t size,
|
|||||||
ofext = ofilename + strlen(ofilename);
|
ofext = ofilename + strlen(ofilename);
|
||||||
strcpy(ofext, ext);
|
strcpy(ofext, ext);
|
||||||
|
|
||||||
while (ofile < 1000)
|
for (ofile = 0; ofile < 1000; ofile++)
|
||||||
{
|
{
|
||||||
assert(strlen(ofilename) < size);
|
assert(strlen(ofilename) < size);
|
||||||
if (!file_exists(ofilename))
|
if (!file_exists(ofilename))
|
||||||
return true;
|
return true;
|
||||||
if (!force)
|
if (!force)
|
||||||
break;
|
break;
|
||||||
upx_snprintf(ofext, 5, ".%03d", ++ofile);
|
upx_snprintf(ofext, 5, ".%03d", ofile);
|
||||||
}
|
}
|
||||||
|
|
||||||
ofilename[0] = 0;
|
ofilename[0] = 0;
|
||||||
@@ -474,7 +474,7 @@ bool makebakname(char *ofilename, size_t size,
|
|||||||
const char *ifilename, bool force)
|
const char *ifilename, bool force)
|
||||||
{
|
{
|
||||||
char *ofext = NULL, *ofname;
|
char *ofext = NULL, *ofname;
|
||||||
int ofile = -1;
|
int ofile;
|
||||||
|
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
return false;
|
return false;
|
||||||
@@ -495,14 +495,14 @@ bool makebakname(char *ofilename, size_t size,
|
|||||||
else
|
else
|
||||||
ofext[strlen(ofext)-1] = '~';
|
ofext[strlen(ofext)-1] = '~';
|
||||||
|
|
||||||
while (ofile < 1000)
|
for (ofile = 0; ofile < 1000; ofile++)
|
||||||
{
|
{
|
||||||
assert(strlen(ofilename) < size);
|
assert(strlen(ofilename) < size);
|
||||||
if (!file_exists(ofilename))
|
if (!file_exists(ofilename))
|
||||||
return true;
|
return true;
|
||||||
if (!force)
|
if (!force)
|
||||||
break;
|
break;
|
||||||
upx_snprintf(ofext, 5, ".%03d", ++ofile);
|
upx_snprintf(ofext, 5, ".%03d", ofile);
|
||||||
}
|
}
|
||||||
|
|
||||||
ofilename[0] = 0;
|
ofilename[0] = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user