Blame acpid-1.0.6-fd.patch
|
Zdenek Prikryl |
20bfb3 |
--- acpid-1.0.6.orig/acpid.c 2007-09-24 18:49:02.000000000 -0400
|
|
Zdenek Prikryl |
20bfb3 |
+++ acpid-1.0.6/acpid.c 2007-09-24 18:52:44.000000000 -0400
|
|
Zdenek Prikryl |
20bfb3 |
@@ -397,7 +397,7 @@ open_log(void)
|
|
Zdenek Prikryl |
20bfb3 |
int log_opts;
|
|
Zdenek Prikryl |
20bfb3 |
|
|
Zdenek Prikryl |
20bfb3 |
/* open /dev/null */
|
|
Zdenek Prikryl |
20bfb3 |
- nullfd = open("/dev/null", O_RDONLY, 0640);
|
|
Zdenek Prikryl |
20bfb3 |
+ nullfd = open("/dev/null", O_RDONLY);
|
|
Zdenek Prikryl |
20bfb3 |
if (nullfd < 0) {
|
|
Zdenek Prikryl |
20bfb3 |
fprintf(stderr, "%s: can't open %s: %s\n", progname,
|
|
Zdenek Prikryl |
20bfb3 |
"/dev/null", strerror(errno));
|
|
Zdenek Prikryl |
20bfb3 |
diff -urp acpid-1.0.6.orig/event.c acpid-1.0.6/event.c
|
|
Zdenek Prikryl |
20bfb3 |
--- acpid-1.0.6.orig/event.c 2007-09-24 18:49:02.000000000 -0400
|
|
Zdenek Prikryl |
20bfb3 |
+++ acpid-1.0.6/event.c 2007-09-24 18:55:10.000000000 -0400
|
|
Zdenek Prikryl |
20bfb3 |
@@ -318,6 +318,7 @@ parse_file(const char *file)
|
|
Zdenek Prikryl |
20bfb3 |
file);
|
|
Zdenek Prikryl |
20bfb3 |
}
|
|
Zdenek Prikryl |
20bfb3 |
free_rule(r);
|
|
Zdenek Prikryl |
20bfb3 |
+ fclose(fp);
|
|
Zdenek Prikryl |
20bfb3 |
return NULL;
|
|
Zdenek Prikryl |
20bfb3 |
}
|
|
Zdenek Prikryl |
20bfb3 |
fclose(fp);
|
|
Zdenek Prikryl |
20bfb3 |
@@ -667,7 +668,7 @@ parse_cmd(const char *cmd, const char *e
|
|
Zdenek Prikryl |
20bfb3 |
i = 0;
|
|
Zdenek Prikryl |
20bfb3 |
|
|
Zdenek Prikryl |
20bfb3 |
memset(buf, 0, sizeof(buf));
|
|
Zdenek Prikryl |
20bfb3 |
- while (i < (sizeof(buf)-1)) {
|
|
Zdenek Prikryl |
20bfb3 |
+ while ((size_t)i < (sizeof(buf)-1)) {
|
|
Zdenek Prikryl |
20bfb3 |
if (*p == '%') {
|
|
Zdenek Prikryl |
20bfb3 |
p++;
|
|
Zdenek Prikryl |
20bfb3 |
if (*p == 'e') {
|
|
Zdenek Prikryl |
20bfb3 |
|