[gentoo-commits] gentoo-projects commit in portage-utils/libq: which.c

[Mike Frysinger (vapier)]

vapier      11/03/01 04:58:39

  Modified:             which.c
  Log:
  touch up style a bit

Revision  Changes    Path
1.2                  portage-utils/libq/which.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/which.c?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/which.c?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/which.c?r1=1.1&r2=1.2

Index: which.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/which.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- which.c	15 Apr 2007 21:42:20 -0000	1.1
+++ which.c	1 Mar 2011 04:58:39 -0000	1.2
@@ -2,19 +2,24 @@
 static char *which(const char *fname)
 {
 	static char fullpath[BUFSIZ];
-	char *path, *p;
+	char *ret, *path, *p;
+
+	ret = NULL;
+
 	path = getenv("PATH");
 	if (!path)
-		return NULL;
+		return ret;
+
 	path = xstrdup(path);
 	while ((p = strrchr(path, ':')) != NULL) {
 		snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname);
 		*p = 0;
-		if (access(fullpath, R_OK) != (-1)) {
-			free(path);
-			return (char *) fullpath;
+		if (access(fullpath, R_OK) != -1) {
+			ret = fullpath;
+			break;
 		}
 	}
 	free(path);
-	return NULL;
+
+	return ret;
 }