d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/package_exists/package_installed/g as that's much more descriptive of

Browse Source 
what the function does.
This commit is contained in:
obrien 2004-01-02 09:19:13 +00:00
parent 522531b7dc
commit 3bf7d53a95
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/sade/sade.h
View File

@ -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);

6
usr.sbin/sysinstall/doc.c
View File

@ -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"

5
usr.sbin/sysinstall/index.c
View File

@ -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;
}

5
usr.sbin/sysinstall/package.c
View File

@ -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) */;

2
usr.sbin/sysinstall/sysinstall.h
View File

@ -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);