Date: Mon, 30 Aug 2010 22:16:26 +0000 From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: Nathan Whitehorn <nwhitehorn@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r212029 - head/usr.sbin/pkg_install/add Message-ID: <4C7C2DBA.6040705@p6m7g8.com> In-Reply-To: <201008302158.o7ULwrgl008914@svn.freebsd.org> References: <201008302158.o7ULwrgl008914@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/30/10 21:58, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Aug 30 21:58:52 2010 > New Revision: 212029 > URL: http://svn.freebsd.org/changeset/base/212029 > > Log: > Use MACHINE_ARCH instead of MACHINE as the directory to fetch packages > from. Packages are architecture dependent, not machine dependent. > > Modified: > head/usr.sbin/pkg_install/add/main.c > > Modified: head/usr.sbin/pkg_install/add/main.c > ============================================================================== > --- head/usr.sbin/pkg_install/add/main.c Mon Aug 30 21:33:33 2010 (r212028) > +++ head/usr.sbin/pkg_install/add/main.c Mon Aug 30 21:58:52 2010 (r212029) > @@ -22,7 +22,7 @@ > __FBSDID("$FreeBSD$"); > > #include <sys/param.h> > -#include <sys/utsname.h> > +#include <sys/sysctl.h> > #include <err.h> > #include <getopt.h> > > @@ -301,7 +301,9 @@ getpackagesite(void) > { > int reldate, i; > static char sitepath[MAXPATHLEN]; > - struct utsname u; > + int archmib[] = { CTL_HW, HW_MACHINE_ARCH }; > + char arch[64]; > + size_t archlen = sizeof(arch); > > if (getenv("PACKAGESITE")) { > if (strlcpy(sitepath, getenv("PACKAGESITE"), sizeof(sitepath)) > @@ -324,8 +326,10 @@ getpackagesite(void) > >= sizeof(sitepath)) > return NULL; > > - uname(&u); > - if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath)) > + if (sysctl(archmib, 2, arch, &archlen, NULL, 0) == -1) > + return NULL; > + arch[archlen-1] = 0; ^^^^^^ '\0' ? - -- - ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iD8DBQFMfC26dbiP+9ubjBwRAn19AJ9oulCApJvsi2b+LeLAIrPiDr3lHQCeMH4n gokbmMFiWv/cgkJpuH2ZfOI= =uEbc -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C7C2DBA.6040705>