| 1 |
commit: 370e5c775a5072583bc57708bbf2c9e0320b8cd8 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 26 21:58:42 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 26 21:58:42 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=370e5c77 |
| 7 |
|
| 8 |
runscript: rename saveDir back to save to fix compile error |
| 9 |
|
| 10 |
--- |
| 11 |
src/rc/runscript.c | 10 +++++----- |
| 12 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/src/rc/runscript.c b/src/rc/runscript.c |
| 15 |
index 0907ce1..02d9e7e 100644 |
| 16 |
--- a/src/rc/runscript.c |
| 17 |
+++ b/src/rc/runscript.c |
| 18 |
@@ -1101,7 +1101,7 @@ runscript(int argc, char **argv) |
| 19 |
int retval, opt, depoptions = RC_DEP_TRACE; |
| 20 |
RC_STRING *svc; |
| 21 |
char path[PATH_MAX], lnk[PATH_MAX]; |
| 22 |
- char *dir, *saveDir = NULL, *saveLnk = NULL; |
| 23 |
+ char *dir, *save = NULL, *saveLnk = NULL; |
| 24 |
char pidstr[10]; |
| 25 |
size_t l = 0, ll; |
| 26 |
const char *file; |
| 27 |
@@ -1133,14 +1133,14 @@ runscript(int argc, char **argv) |
| 28 |
if (readlink(argv[1], lnk, sizeof(lnk)-1)) { |
| 29 |
dir = dirname(path); |
| 30 |
if (strchr(lnk, '/')) { |
| 31 |
- saveDir = xstrdup(dir); |
| 32 |
+ save = xstrdup(dir); |
| 33 |
saveLnk = xstrdup(lnk); |
| 34 |
dir = dirname(saveLnk); |
| 35 |
- if (strcmp(dir, saveDir) == 0) |
| 36 |
+ if (strcmp(dir, save) == 0) |
| 37 |
file = basename_c(argv[1]); |
| 38 |
else |
| 39 |
file = basename_c(lnk); |
| 40 |
- dir = saveDir; |
| 41 |
+ dir = save; |
| 42 |
} else |
| 43 |
file = basename_c(argv[1]); |
| 44 |
ll = strlen(dir) + strlen(file) + 2; |
| 45 |
@@ -1150,7 +1150,7 @@ runscript(int argc, char **argv) |
| 46 |
free(service); |
| 47 |
service = xstrdup(lnk); |
| 48 |
} |
| 49 |
- free(saveDir); |
| 50 |
+ free(save); |
| 51 |
free(saveLnk); |
| 52 |
} |
| 53 |
if (!service) |
Archives