From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QlpiV-0004ed-Hw for garchives@archives.gentoo.org; Tue, 26 Jul 2011 22:03:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DA8D21C2CF for ; Tue, 26 Jul 2011 22:03:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A212121C0E3 for ; Tue, 26 Jul 2011 21:59:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B6952AC015 for ; Tue, 26 Jul 2011 21:59:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 359B68003D for ; Tue, 26 Jul 2011 21:59:00 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <370e5c775a5072583bc57708bbf2c9e0320b8cd8.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/runscript.c X-VCS-Directories: src/rc/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 370e5c775a5072583bc57708bbf2c9e0320b8cd8 Date: Tue, 26 Jul 2011 21:59:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 25b17f49cd381f9cfc3a74e3cba1dc39 commit: 370e5c775a5072583bc57708bbf2c9e0320b8cd8 Author: William Hubbs gentoo org> AuthorDate: Tue Jul 26 21:58:42 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jul 26 21:58:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D370e5c77 runscript: rename saveDir back to save to fix compile error --- src/rc/runscript.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 0907ce1..02d9e7e 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -1101,7 +1101,7 @@ runscript(int argc, char **argv) int retval, opt, depoptions =3D RC_DEP_TRACE; RC_STRING *svc; char path[PATH_MAX], lnk[PATH_MAX]; - char *dir, *saveDir =3D NULL, *saveLnk =3D NULL; + char *dir, *save =3D NULL, *saveLnk =3D NULL; char pidstr[10]; size_t l =3D 0, ll; const char *file; @@ -1133,14 +1133,14 @@ runscript(int argc, char **argv) if (readlink(argv[1], lnk, sizeof(lnk)-1)) { dir =3D dirname(path); if (strchr(lnk, '/')) { - saveDir =3D xstrdup(dir); + save =3D xstrdup(dir); saveLnk =3D xstrdup(lnk); dir =3D dirname(saveLnk); - if (strcmp(dir, saveDir) =3D=3D 0) + if (strcmp(dir, save) =3D=3D 0) file =3D basename_c(argv[1]); else file =3D basename_c(lnk); - dir =3D saveDir; + dir =3D save; } else file =3D basename_c(argv[1]); ll =3D strlen(dir) + strlen(file) + 2; @@ -1150,7 +1150,7 @@ runscript(int argc, char **argv) free(service); service =3D xstrdup(lnk); } - free(saveDir); + free(save); free(saveLnk); } if (!service)