zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-17 15:42:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Win32 updates

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@784 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-10-26 18:57:23 +00:00 • committed by cras
commit e0bc134d66
7 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib-popt/findme.c
View file

@ -39,8 +39,10 @@ char * findProgramPath(char * argv0) {
*chptr = '\0';
sprintf(buf, "%s/%s", start, argv0);
#ifndef WIN32
if (!access(buf, X_OK))
return buf;
#endif
if (chptr)
start = chptr + 1;

2
src/lib-popt/poptconfig.c
View file

@ -127,7 +127,9 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
rc = poptReadConfigFile(con, "/etc/popt");
if (rc) return rc;
#ifndef WIN32
if (getuid() != geteuid()) return 0;
#endif
if ((home = getenv("HOME"))) {
fn = alloca(strlen(home) + 20);

5
src/lib-popt/poptparse.c
View file

@ -29,7 +29,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
int i, buflen;
buflen = strlen(s) + 1;
bufStart = buf = alloca(buflen);
bufStart = buf = malloc(buflen);
memset(buf, '\0', buflen);
src = s;
@ -43,6 +43,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
src++;
if (!*src) {
free(argv);
free(bufStart);
return POPT_ERROR_BADQUOTE;
}
if (*src != quote) *buf++ = '\\';
@ -66,6 +67,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
src++;
if (!*src) {
free(argv);
free(bufStart);
return POPT_ERROR_BADQUOTE;
}
/* fallthrough */
@ -95,5 +97,6 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
*argvPtr = argv2;
*argcPtr = argc;
free(bufStart);
return 0;
}