Deleted Added
sdiff udiff text old ( 183921 ) new ( 184180 )
full compact
package.c (183921) package.c (184180)
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
7 * Copyright (c) 1995
8 * Jordan Hubbard. All rights reserved.

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

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
7 * Copyright (c) 1995
8 * Jordan Hubbard. All rights reserved.

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

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/usr.sbin/sysinstall/package.c 183921 2008-10-15 15:54:33Z kensmith $
33 * $FreeBSD: head/usr.sbin/sysinstall/package.c 184180 2008-10-22 20:32:19Z kensmith $
34 */
35
36#include "sysinstall.h"
37#include <sys/errno.h>
38#include <sys/time.h>
39#include <sys/param.h>
40#include <sys/mount.h>
41#include <sys/stat.h>

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

50
51extern PkgNode Top;
52
53/* Like package_extract, but assumes current media device and chases deps */
54int
55package_add(char *name)
56{
57 PkgNodePtr tmp;
34 */
35
36#include "sysinstall.h"
37#include <sys/errno.h>
38#include <sys/time.h>
39#include <sys/param.h>
40#include <sys/mount.h>
41#include <sys/stat.h>

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

50
51extern PkgNode Top;
52
53/* Like package_extract, but assumes current media device and chases deps */
54int
55package_add(char *name)
56{
57 PkgNodePtr tmp;
58 int i;
58 int i, current, low, high;
59
60 if (!mediaVerify())
61 return DITEM_FAILURE;
62
63 if (!DEVICE_INIT(mediaDevice))
64 return DITEM_FAILURE;
65
66 i = index_initialize("packages/INDEX");
67 if (DITEM_STATUS(i) != DITEM_SUCCESS)
68 return i;
69
70 tmp = index_search(&Top, name, &tmp);
59
60 if (!mediaVerify())
61 return DITEM_FAILURE;
62
63 if (!DEVICE_INIT(mediaDevice))
64 return DITEM_FAILURE;
65
66 i = index_initialize("packages/INDEX");
67 if (DITEM_STATUS(i) != DITEM_SUCCESS)
68 return i;
69
70 tmp = index_search(&Top, name, &tmp);
71 if (tmp)
72 return index_extract(mediaDevice, &Top, tmp, FALSE, 0);
73 else {
71 if (tmp) {
72 if (have_volumes) {
73 low = low_volume;
74 high = high_volume;
75 } else
76 low = high = 0;
77 for (current = low; current <= high; current++)
78 i = index_extract(mediaDevice, &Top, tmp, FALSE, current);
79 return i;
80 } else {
74 msgConfirm("Sorry, package %s was not found in the INDEX.", name);
75 return DITEM_FAILURE;
76 }
77}
78
79/* For use by dispatch */
80int
81packageAdd(dialogMenuItem *self)

--- 182 unchanged lines hidden --- 		81 msgConfirm("Sorry, package %s was not found in the INDEX.", name);
82 return DITEM_FAILURE;
83 }
84}
85
86/* For use by dispatch */
87int
88packageAdd(dialogMenuItem *self)

--- 182 unchanged lines hidden ---