Page MenuHomeFreeBSD
Files F157167893

D28766.id84199.diff
No OneTemporary
Actions

D28766.id84199.diff
View Options

Index: usr.sbin/pkg/pkg.c
===================================================================
--- usr.sbin/pkg/pkg.c
+++ usr.sbin/pkg/pkg.c
@@ -1038,6 +1038,40 @@
return (ret);
}
+#define PKG_NAME "pkg"
+#define PKG_DEVEL_NAME PKG_NAME "-devel"
+#define PKG_PKG PKG_NAME "."
+
+static bool
+pkg_is_pkg_pkg(const char *pkg)
+{
+ char *vstart;
+ size_t namelen;
+
+ /*
+ * Chop off the final "-" (version delimiter) and check the name that
+ * precedes it. If we didn't have a version delimiter, it must be the
+ * pkg.$archive short form but we'll check it anyways. pkg-devel short
+ * form will look like a pkg archive with 'devel' version, but that's
+ * OK. We otherwise assumed that non-pkg packages will always have a
+ * version component.
+ */
+ vstart = strrchr(pkg, '-');
+ if (vstart == NULL) {
+ return (strlen(pkg) > sizeof(PKG_PKG) - 1 &&
+ strncmp(pkg, PKG_PKG, sizeof(PKG_PKG) - 1) == 0);
+ }
+
+ namelen = vstart - pkg;
+ if (namelen == sizeof(PKG_NAME) - 1 &&
+ strncmp(pkg, PKG_NAME, sizeof(PKG_NAME) - 1) == 0)
+ return (true);
+ if (namelen == sizeof(PKG_DEVEL_NAME) - 1 &&
+ strncmp(pkg, PKG_DEVEL_NAME, sizeof(PKG_DEVEL_NAME) - 1) == 0)
+ return (true);
+ return (false);
+}
+
int
main(int argc, char *argv[])
{
@@ -1141,13 +1175,25 @@
fprintf(stderr, args_bootstrap_message);
exit(EXIT_FAILURE);
}
- // For add, we accept exactly one further argument
else if (add_pkg && pkgarg != NULL) {
- fprintf(stderr, args_add_message);
- exit(EXIT_FAILURE);
+ /*
+ * Additional arguments also means it's not a
+ * local bootstrap request.
+ */
+ add_pkg = false;
}
else if (add_pkg) {
- pkgarg = argv[optind-1];
+ /*
+ * If it's not a request for pkg or pkg-devel,
+ * then we must assume they were trying to
+ * install some other local package and we
+ * should try to bootstrap from the repo.
+ */
+ if (!pkg_is_pkg_pkg(argv[optind-1])) {
+ add_pkg = false;
+ } else {
+ pkgarg = argv[optind-1];
+ }
}
break;
default:

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 11:35 PM (16 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33331131
Default Alt Text
D28766.id84199.diff (2 KB)

Event Timeline