Deleted Added
full compact
plist.c (154102) plist.c (167972)
1/*
2 * FreeBSD install - a package for the installation and maintainance
3 * of non-core utilities.
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

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

14 * Jordan K. Hubbard
15 * 18 July 1993
16 *
17 * General packing list routines.
18 *
19 */
20
21#include <sys/cdefs.h>
1/*
2 * FreeBSD install - a package for the installation and maintainance
3 * of non-core utilities.
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

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

14 * Jordan K. Hubbard
15 * 18 July 1993
16 *
17 * General packing list routines.
18 *
19 */
20
21#include <sys/cdefs.h>
22__FBSDID("$FreeBSD: head/usr.sbin/pkg_install/lib/plist.c 154102 2006-01-07 22:10:58Z krion $");
22__FBSDID("$FreeBSD: head/usr.sbin/pkg_install/lib/plist.c 167972 2007-03-28 05:33:52Z njl $");
23
24#include "lib.h"
25#include <err.h>
26#include <md5.h>
27
28/* Add an item to a packing list */
29void
30add_plist(Package *p, plist_t type, const char *arg)

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

475 cp = MD5Data((unsigned char *)linkbuf, len, buf);
476 } else if (isfile(tmp) || verscmp(pkg, 1, 1) < 0)
477 cp = MD5File(tmp, buf);
478
479 if (cp != NULL) {
480 /* Mismatch? */
481 if (strcmp(cp, p->next->name + 4)) {
482 warnx("'%s' fails original MD5 checksum - %s",
23
24#include "lib.h"
25#include <err.h>
26#include <md5.h>
27
28/* Add an item to a packing list */
29void
30add_plist(Package *p, plist_t type, const char *arg)

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

475 cp = MD5Data((unsigned char *)linkbuf, len, buf);
476 } else if (isfile(tmp) || verscmp(pkg, 1, 1) < 0)
477 cp = MD5File(tmp, buf);
478
479 if (cp != NULL) {
480 /* Mismatch? */
481 if (strcmp(cp, p->next->name + 4)) {
482 warnx("'%s' fails original MD5 checksum - %s",
483 tmp, Force ? "deleted anyway." : "not deleted.");
483 tmp, Force ? "deleted anyway." : "not deleted.");
484 if (!Force) {
485 fail = FAIL;
486 continue;
487 }
488 }
489 }
490 }
491 if (Verbose)

--- 97 unchanged lines hidden ---
484 if (!Force) {
485 fail = FAIL;
486 continue;
487 }
488 }
489 }
490 }
491 if (Verbose)

--- 97 unchanged lines hidden ---