diff options
| author | flz <flz@FreeBSD.org> | 2008-06-16 23:41:11 +0000 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2008-06-16 23:41:11 +0000 |
| commit | ffdd95144d91bbe70b7085db0ac76bac74571854 (patch) | |
| tree | 80025785a72ffe15367413befe15285f7296a16b /usr.sbin/pkg_install/add | |
| parent | c4c883e016f0453aa584a7763e605740ff247840 (diff) | |
| download | FreeBSD-src-ffdd95144d91bbe70b7085db0ac76bac74571854.zip FreeBSD-src-ffdd95144d91bbe70b7085db0ac76bac74571854.tar.gz | |
Remove support for RELENG_4 (__FreeBSD_version < 500039).
MFC after: 1 day
Diffstat (limited to 'usr.sbin/pkg_install/add')
| -rw-r--r-- | usr.sbin/pkg_install/add/main.c | 7 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 1556897..c681f98 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -223,12 +223,7 @@ main(int argc, char **argv) if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' && (ptr[2] == 'b' || ptr[2] == 'g') && ptr[3] == 'z' && !ptr[4])) - if (strlcat(remotepkg, -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 - ".tbz", -#else - ".tgz", -#endif + if (strlcat(remotepkg, ".tbz", sizeof(temppackageroot)) >= sizeof(temppackageroot)) errx(1, "package name too long"); } diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index b4130d1..872c7a8 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -308,11 +308,7 @@ pkg_do(char *pkg) ext = strrchr(pkg_fullname, '.'); if (ext == NULL) -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 ext = ".tbz"; -#else - ext = ".tgz"; -#endif snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), p->name, ext); if (fexists(path)) cp = path; |
