summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/doc.c6
-rw-r--r--usr.sbin/sysinstall/index.c5
-rw-r--r--usr.sbin/sysinstall/package.c5
-rw-r--r--usr.sbin/sysinstall/sysinstall.h2
4 files changed, 7 insertions, 11 deletions
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index 7293619..5294972 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -4,8 +4,6 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $FreeBSD$
- *
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
*
@@ -31,8 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
-
*
+ * $FreeBSD$
*/
#include "sysinstall.h"
@@ -53,7 +51,7 @@ docBrowser(dialogMenuItem *self)
}
/* First, make sure we have whatever browser we've chosen is here */
- if (!package_exists(browser)) {
+ if (!package_installed(browser)) {
ret = package_add(browser);
if (DITEM_STATUS(ret) != DITEM_SUCCESS) {
msgConfirm("Unable to install the %s HTML browser package. You may\n"
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index b7ef309..4ceea81 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -4,8 +4,6 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD$
- *
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
*
@@ -32,6 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include <fcntl.h>
@@ -220,7 +219,7 @@ new_index(char *name, char *pathto, char *prefix, char *comment, char *descr, ch
tmp->maintainer = _strdup(maint);
tmp->deps = _strdup(deps);
tmp->depc = 0;
- tmp->installed = package_exists(name);
+ tmp->installed = package_installed(name);
tmp->volume = volume;
return tmp;
}
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index a160eb1..a207399 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,8 +4,6 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD$
- *
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
*
@@ -32,6 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include "sysinstall.h"
@@ -93,7 +92,7 @@ packageAdd(dialogMenuItem *self)
}
Boolean
-package_exists(char *name)
+package_installed(char *name)
{
char fname[FILENAME_MAX];
int status /* = vsystem("pkg_info -e %s", name) */;
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 01de16d..e4c939f 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -801,7 +801,7 @@ extern int optionsEditor(dialogMenuItem *self);
extern int packageAdd(dialogMenuItem *self);
extern int package_add(char *name);
extern int package_extract(Device *dev, char *name, Boolean depended);
-extern Boolean package_exists(char *name);
+extern Boolean package_installed(char *name);
/* pccard.c */
extern void pccardInitialize(void);
OpenPOWER on IntegriCloud