Date: Mon, 31 May 2010 03:35:46 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 178999 for review Message-ID: <201005310335.o4V3ZkmJ094288@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178999?ac=10 Change 178999 by gcooper@gcooper-bayonetta on 2010/05/31 03:34:58 Fix typos. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 (text+ko) ==== @@ -50,7 +50,7 @@ if (tmp == NULL) retcode = -1; - else + else { tmp->name = copy_string(arg); tmp->type = type; @@ -97,7 +97,7 @@ if (tmp == NULL) retcode = -1; - else + else { tmp->name = copy_string(arg); tmp->type = type; @@ -690,7 +690,7 @@ */ if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) { - char linkbuf[PATHNAME_MAX]; + char linkbuf[PATH_MAX]; int len; if ((len = readlink(tmp, @@ -808,10 +808,10 @@ if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir)) retcode = -1; - } else if (isdir(dir) && !issymlink(dir)) + } else if (isdir(dir) && !issymlink(dir)) { if (RMDIR(dir) && !ign_err) retcode = -1; - else + } else if (REMOVE(dir, ign_err)) retcode = -1; @@ -831,14 +831,13 @@ retcode = 0; - if (nukedirs == TRUE) { - + if (nukedirs == TRUE) while (cp2 != NULL && retcode == 0) { if ((cp2 = strrchr(cp1, '/')) != NULL) *cp2 = '\0'; if (!isemptydir(dir)) - retcode == 0; + retcode = 0; if (RMDIR(dir) && !ign_err) { if (!fexists(dir))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005310335.o4V3ZkmJ094288>