Deleted Added
full compact
pkgng.c (245828) pkgng.c (245837)
1/*-
2 * Copyright (c) 2012 Eitan Adler
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2012 Eitan Adler
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.sbin/pkg_install/lib/pkgng.c 245828 2013-01-22 22:41:12Z bapt $
26 * $FreeBSD: head/usr.sbin/pkg_install/lib/pkgng.c 245837 2013-01-23 07:22:33Z jasone $
27 */
28
29#include <sys/cdefs.h>
30
31#include "lib.h"
32#include <err.h>
33
34static const char message[] = "You appear to be using the newer pkg(1) tool on \

--- 10 unchanged lines hidden (view full) ---

45
46 dontwarn = getenv("PKG_OLD_NOWARN");
47 if (dontwarn != NULL)
48 return;
49 pkgngdir = getenv("PKG_DBDIR");
50 if (pkgngdir == NULL)
51 pkgngdir = "/var/db/pkg";
52
27 */
28
29#include <sys/cdefs.h>
30
31#include "lib.h"
32#include <err.h>
33
34static const char message[] = "You appear to be using the newer pkg(1) tool on \

--- 10 unchanged lines hidden (view full) ---

45
46 dontwarn = getenv("PKG_OLD_NOWARN");
47 if (dontwarn != NULL)
48 return;
49 pkgngdir = getenv("PKG_DBDIR");
50 if (pkgngdir == NULL)
51 pkgngdir = "/var/db/pkg";
52
53 rc = snprintf(pkgngpath, sizeof(pkgngpath) "%s/local.sqlite", pkgngdir);
54 if (rc >= sizeof(pkgngpath)) {
53 rc = snprintf(pkgngpath, sizeof(pkgngpath), "%s/local.sqlite", pkgngdir);
54 if ((size_t)rc >= sizeof(pkgngpath)) {
55 warnx("path too long: %s/local.sqlite", pkgngdir);
56 return;
57 }
58
59 if (access(pkgngpath, F_OK) == 0)
60 warnx(message);
61}
55 warnx("path too long: %s/local.sqlite", pkgngdir);
56 return;
57 }
58
59 if (access(pkgngpath, F_OK) == 0)
60 warnx(message);
61}