hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-09 16:01:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate some varargs abuse.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1999-07-02 22:36:14 +00:00
parent fc9961b5dd
commit 7050843886
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=48482
10 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
release/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.68 1999/05/27 10:32:45 jkh Exp $
* $Id: index.c,v 1.69 1999/06/28 02:37:34 billf Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -637,11 +637,19 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
*cp2 = '\0';
if ((tmp2 = index_search(top, cp, NULL)) != NULL) {
status = index_extract(dev, top, tmp2, TRUE);
if (DITEM_STATUS(status) != DITEM_SUCCESS)
msgCNotify("Loading of dependant package %s failed", cp);
if (DITEM_STATUS(status) != DITEM_SUCCESS) {
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Loading of dependant package %s failed", cp);
else
msgConfirm("Loading of dependant package %s failed", cp);
}
}
else if (!package_exists(cp)) {
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Warning: %s is a required package but was not found.", cp);
else
msgConfirm("Warning: %s is a required package but was not found.", cp);
}
else if (!package_exists(cp))
msgCNotify("Warning: %s is a required package but was not found.", cp);
if (cp2)
cp = cp2 + 1;
else

16
release/sysinstall/msg.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: msg.c,v 1.47 1997/09/20 02:48:48 jkh Exp $
* $Id: msg.c,v 1.48 1999/05/27 10:32:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -217,20 +217,6 @@ msgNotify(char *fmt, ...)
dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Put up a message in a popup or notifier box, depending on NO_CONFIRM */
void
msgCNotify(char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if (variable_get(VAR_NO_CONFIRM))
msgNotify(fmt, args);
else
msgConfirm(fmt, args);
va_end(args);
}
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
int
msgYesNo(char *fmt, ...)

18
release/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.76 1999/05/18 00:44:28 jkh Exp $
* $Id: package.c,v 1.77 1999/05/27 10:32:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -218,8 +218,12 @@ package_extract(Device *dev, char *name, Boolean depended)
i = waitpid(pid, &tot, 0);
if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) {
ret = DITEM_FAILURE | DITEM_RESTORE;
msgCNotify("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
else
msgConfirm("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
}
else
msgNotify("Package %s was added successfully", name);
@ -233,8 +237,12 @@ package_extract(Device *dev, char *name, Boolean depended)
}
else {
dialog_clear_norefresh();
msgCNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
else
msgConfirm("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
ret = DITEM_FAILURE | DITEM_RESTORE;
}
signal(SIGPIPE, SIG_IGN);

3
release/sysinstall/sysinstall.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.165 1999/05/15 14:34:22 jkh Exp $
* $Id: sysinstall.h,v 1.166 1999/05/27 10:32:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -645,7 +645,6 @@ extern void msgError(char *fmt, ...);
extern void msgFatal(char *fmt, ...);
extern void msgConfirm(char *fmt, ...);
extern void msgNotify(char *fmt, ...);
extern void msgCNotify(char *fmt, ...);
extern void msgWeHaveOutput(char *fmt, ...);
extern int msgYesNo(char *fmt, ...);
extern char *msgGetInput(char *buf, char *fmt, ...);

16
usr.sbin/sade/msg.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: msg.c,v 1.47 1997/09/20 02:48:48 jkh Exp $
* $Id: msg.c,v 1.48 1999/05/27 10:32:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -217,20 +217,6 @@ msgNotify(char *fmt, ...)
dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Put up a message in a popup or notifier box, depending on NO_CONFIRM */
void
msgCNotify(char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if (variable_get(VAR_NO_CONFIRM))
msgNotify(fmt, args);
else
msgConfirm(fmt, args);
va_end(args);
}
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
int
msgYesNo(char *fmt, ...)

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

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.165 1999/05/15 14:34:22 jkh Exp $
* $Id: sysinstall.h,v 1.166 1999/05/27 10:32:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -645,7 +645,6 @@ extern void msgError(char *fmt, ...);
extern void msgFatal(char *fmt, ...);
extern void msgConfirm(char *fmt, ...);
extern void msgNotify(char *fmt, ...);
extern void msgCNotify(char *fmt, ...);
extern void msgWeHaveOutput(char *fmt, ...);
extern int msgYesNo(char *fmt, ...);
extern char *msgGetInput(char *buf, char *fmt, ...);

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

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.68 1999/05/27 10:32:45 jkh Exp $
* $Id: index.c,v 1.69 1999/06/28 02:37:34 billf Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -637,11 +637,19 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
*cp2 = '\0';
if ((tmp2 = index_search(top, cp, NULL)) != NULL) {
status = index_extract(dev, top, tmp2, TRUE);
if (DITEM_STATUS(status) != DITEM_SUCCESS)
msgCNotify("Loading of dependant package %s failed", cp);
if (DITEM_STATUS(status) != DITEM_SUCCESS) {
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Loading of dependant package %s failed", cp);
else
msgConfirm("Loading of dependant package %s failed", cp);
}
}
else if (!package_exists(cp)) {
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Warning: %s is a required package but was not found.", cp);
else
msgConfirm("Warning: %s is a required package but was not found.", cp);
}
else if (!package_exists(cp))
msgCNotify("Warning: %s is a required package but was not found.", cp);
if (cp2)
cp = cp2 + 1;
else

16
usr.sbin/sysinstall/msg.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: msg.c,v 1.47 1997/09/20 02:48:48 jkh Exp $
* $Id: msg.c,v 1.48 1999/05/27 10:32:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -217,20 +217,6 @@ msgNotify(char *fmt, ...)
dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Put up a message in a popup or notifier box, depending on NO_CONFIRM */
void
msgCNotify(char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if (variable_get(VAR_NO_CONFIRM))
msgNotify(fmt, args);
else
msgConfirm(fmt, args);
va_end(args);
}
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
int
msgYesNo(char *fmt, ...)

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

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.76 1999/05/18 00:44:28 jkh Exp $
* $Id: package.c,v 1.77 1999/05/27 10:32:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -218,8 +218,12 @@ package_extract(Device *dev, char *name, Boolean depended)
i = waitpid(pid, &tot, 0);
if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) {
ret = DITEM_FAILURE | DITEM_RESTORE;
msgCNotify("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
else
msgConfirm("Add of package %s aborted, error code %d -\n"
"Please check the debug screen for more info.", name, WEXITSTATUS(tot));
}
else
msgNotify("Package %s was added successfully", name);
@ -233,8 +237,12 @@ package_extract(Device *dev, char *name, Boolean depended)
}
else {
dialog_clear_norefresh();
msgCNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
else
msgConfirm("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);
ret = DITEM_FAILURE | DITEM_RESTORE;
}
signal(SIGPIPE, SIG_IGN);

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

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.165 1999/05/15 14:34:22 jkh Exp $
* $Id: sysinstall.h,v 1.166 1999/05/27 10:32:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -645,7 +645,6 @@ extern void msgError(char *fmt, ...);
extern void msgFatal(char *fmt, ...);
extern void msgConfirm(char *fmt, ...);
extern void msgNotify(char *fmt, ...);
extern void msgCNotify(char *fmt, ...);
extern void msgWeHaveOutput(char *fmt, ...);
extern int msgYesNo(char *fmt, ...);
extern char *msgGetInput(char *buf, char *fmt, ...);