Deleted Added
sdiff udiff text old ( 8576 ) new ( 8589 )
full compact
dist.c (8576) dist.c (8589)
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 *
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 * $Id: dist.c,v 1.5 1995/05/16 11:37:11 jkh Exp $
7 * $Id: dist.c,v 1.6 1995/05/17 14:39:40 jkh Exp $
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

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

153{ "libexec", &SrcDists, DIST_SRC_LIBEXEC, NULL },
154{ "lkm", &SrcDists, DIST_SRC_LKM, NULL },
155{ "release", &SrcDists, DIST_SRC_RELEASE, NULL },
156{ "sbin", &SrcDists, DIST_SRC_SBIN, NULL },
157{ "share", &SrcDists, DIST_SRC_SHARE, NULL },
158{ "sys", &SrcDists, DIST_SRC_SYS, NULL },
159{ "ubin", &SrcDists, DIST_SRC_UBIN, NULL },
160{ "usbin", &SrcDists, DIST_SRC_USBIN, NULL },
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

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

153{ "libexec", &SrcDists, DIST_SRC_LIBEXEC, NULL },
154{ "lkm", &SrcDists, DIST_SRC_LKM, NULL },
155{ "release", &SrcDists, DIST_SRC_RELEASE, NULL },
156{ "sbin", &SrcDists, DIST_SRC_SBIN, NULL },
157{ "share", &SrcDists, DIST_SRC_SHARE, NULL },
158{ "sys", &SrcDists, DIST_SRC_SYS, NULL },
159{ "ubin", &SrcDists, DIST_SRC_UBIN, NULL },
160{ "usbin", &SrcDists, DIST_SRC_USBIN, NULL },
161{ "xf86", &SrcDists, DIST_SRC_XF86, NULL },
161{ NULL },
162};
163
164/* The XFree86 distribution */
165static Distribution XF86DistTable[] = {
166{ "bin", &XF86Dists, DIST_XF86_BIN, NULL },
167{ "lib", &XF86Dists, DIST_XF86_LIB, NULL },
168{ "doc", &XF86Dists, DIST_XF86_DOC, NULL },

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

220 if (fp) {
221 status = mediaExtractDist(fp);
222 fclose(fp);
223 }
224 else {
225 if (getenv(NO_CONFIRMATION))
226 status = 0;
227 else
162{ NULL },
163};
164
165/* The XFree86 distribution */
166static Distribution XF86DistTable[] = {
167{ "bin", &XF86Dists, DIST_XF86_BIN, NULL },
168{ "lib", &XF86Dists, DIST_XF86_LIB, NULL },
169{ "doc", &XF86Dists, DIST_XF86_DOC, NULL },

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

221 if (fp) {
222 status = mediaExtractDist(fp);
223 fclose(fp);
224 }
225 else {
226 if (getenv(NO_CONFIRMATION))
227 status = 0;
228 else
228 status = msgYesNo("Unable to retreive the %s distribution from %s.\nDo you want to retry that distribution later?");
229 status = msgYesNo("Unable to transfer the %s distribution from %s.\nDo you want to retry this distribution later?");
229 }
230 }
231 if (!status) {
232 /*
233 * Extract was successful, remove ourselves from further
234 * consideration
235 */
236 *(me[i].my_mask) &= ~(me[i].my_bit);
237 }
238 }
239 }
240 return status;
241}
242
243void
244distExtractAll(void)
245{
246 distExtract(NULL, DistTable);
247}
230 }
231 }
232 if (!status) {
233 /*
234 * Extract was successful, remove ourselves from further
235 * consideration
236 */
237 *(me[i].my_mask) &= ~(me[i].my_bit);
238 }
239 }
240 }
241 return status;
242}
243
244void
245distExtractAll(void)
246{
247 distExtract(NULL, DistTable);
248}