summaryrefslogtreecommitdiff
path: root/usr/src/cmd/sgs/crle/common/print.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/sgs/crle/common/print.c')
-rw-r--r--usr/src/cmd/sgs/crle/common/print.c126
1 files changed, 15 insertions, 111 deletions
diff --git a/usr/src/cmd/sgs/crle/common/print.c b/usr/src/cmd/sgs/crle/common/print.c
index a614c2988e..2f701d37d5 100644
--- a/usr/src/cmd/sgs/crle/common/print.c
+++ b/usr/src/cmd/sgs/crle/common/print.c
@@ -154,16 +154,6 @@ fablib(Crle_desc * crle, int flag)
list = &crle->c_eslibpath;
break;
- case CRLE_ADLIB:
- path = MSG_ORIG(MSG_PTH_AOUTDLP);
- list = &crle->c_adlibpath;
- break;
-
- case CRLE_ASLIB:
- path = MSG_ORIG(MSG_PTH_NEWTD);
- list = &crle->c_aslibpath;
- break;
-
default:
return (1);
}
@@ -205,6 +195,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
const char *strtbl;
int ndx, bkts;
APlist *cmdline = NULL;
+ boolean_t cmdset = B_FALSE;
char _cmd[PATH_MAX], *cmd;
char _objdir[PATH_MAX], *objdir = NULL;
@@ -374,6 +365,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
conv_dl_flag(head->ch_dlflags, CONV_FMT_ALT_CRLE,
&dl_flag_buf));
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
}
@@ -419,6 +411,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
/*
* Construct the original command line arguments.
*/
+ cmdset = B_TRUE;
(void) snprintf(_cmd, PATH_MAX,
MSG_ORIG(MSG_CMD_OUTPUT), crle->c_objdir);
cmd = strdupa(_cmd);
@@ -442,7 +435,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
str = (const char *)(head->ch_edlibpath + addr);
if (crle->c_flags & CRLE_UPDATE) {
- crle->c_flags &= ~CRLE_AOUT;
if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
if (head->ch_cnflags & RTC_HDR_64)
@@ -465,6 +457,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
(void) snprintf(_cmd, PATH_MAX,
MSG_ORIG(MSG_CMD_EDLIB), str);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
}
@@ -499,7 +492,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
str = (const char *)(head->ch_eslibpath + addr);
if (crle->c_flags & CRLE_UPDATE) {
- crle->c_flags &= ~CRLE_AOUT;
if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
if (head->ch_cnflags & RTC_HDR_64)
@@ -522,6 +514,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
(void) snprintf(_cmd, PATH_MAX,
MSG_ORIG(MSG_CMD_ESLIB), str);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
}
@@ -550,86 +543,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
}
}
- if (head->ch_adlibpath) {
- const char *str;
-
- str = (const char *)(head->ch_adlibpath + addr);
-
- if (crle->c_flags & CRLE_UPDATE) {
- crle->c_flags |= CRLE_AOUT;
- if (addlib(crle, &crle->c_adlibpath, str) != 0)
- return (INSCFG_RET_FAIL);
- } else {
- (void) printf(MSG_INTL(MSG_DMP_DLIBPTH),
- MSG_ORIG(MSG_STR_AOUT), str);
-
- (void) snprintf(_cmd, PATH_MAX,
- MSG_ORIG(MSG_CMD_ADLIB), str);
- cmd = strdupa(_cmd);
- if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL)
- return (INSCFG_RET_FAIL);
- }
- } else {
- if (crle->c_flags & CRLE_UPDATE) {
- if (crle->c_flags & CRLE_ADLIB) {
- /*
- * If we've been asked to update a configuration
- * file, and no existing default AOUT search
- * path exists, but the user is going to add new
- * entries, fabricate the system defaults so
- * that the users get added to them.
- */
- if (fablib(crle, CRLE_ADLIB) != 0)
- return (INSCFG_RET_FAIL);
- }
- } else if (crle->c_flags & CRLE_AOUT) {
- /*
- * Indicate any system default.
- */
- (void) printf(MSG_INTL(MSG_DEF_AOUTDLP));
- }
- }
-
- if (head->ch_aslibpath) {
- const char *str;
-
- str = (const char *)(head->ch_aslibpath + addr);
-
- if (crle->c_flags & CRLE_UPDATE) {
- crle->c_flags |= CRLE_AOUT;
- if (addlib(crle, &crle->c_aslibpath, str) != 0)
- return (INSCFG_RET_FAIL);
- } else {
- (void) printf(MSG_INTL(MSG_DMP_TLIBPTH),
- MSG_ORIG(MSG_STR_AOUT), str);
-
- (void) snprintf(_cmd, PATH_MAX,
- MSG_ORIG(MSG_CMD_ASLIB), str);
- cmd = strdupa(_cmd);
- if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL)
- return (INSCFG_RET_FAIL);
- }
- } else {
- if (crle->c_flags & CRLE_UPDATE) {
- if (crle->c_flags & CRLE_ASLIB) {
- /*
- * If we've been asked to update a configuration
- * file, and no existing default AOUT secure
- * path exists, but the user is going to add new
- * entries, fabricate the system defaults so
- * that the users get added to them.
- */
- if (fablib(crle, CRLE_ASLIB) != 0)
- return (INSCFG_RET_FAIL);
- }
- } else if (crle->c_flags & CRLE_AOUT) {
- /*
- * Indicate any system default.
- */
- (void) printf(MSG_INTL(MSG_DEF_AOUTNEWTD));
- }
- }
-
/*
* Display any environment variables.
*/
@@ -662,6 +575,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
(void) printf(pfmt, str);
(void) snprintf(_cmd, PATH_MAX, sfmt, str);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd,
AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
@@ -725,7 +639,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
* If there's no hash table there's nothing else to process.
*/
if (head->ch_hash == 0) {
- if ((crle->c_flags & CRLE_UPDATE) == 0)
+ if (((crle->c_flags & CRLE_UPDATE) == 0) && cmdset)
printcmd(crle, head, cmdline);
return (INSCFG_RET_OK);
}
@@ -763,6 +677,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
(void) snprintf(_cmd, PATH_MAX,
getformat(dobj->co_flags), str);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd,
AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
@@ -856,6 +771,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
MSG_ORIG(MSG_CMD_OUTPUT),
crle->c_objdir);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd,
AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
@@ -865,6 +781,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
(void) snprintf(_cmd, PATH_MAX,
getformat(flags), str);
cmd = strdupa(_cmd);
+ cmdset = B_TRUE;
if (aplist_append(&cmdline, cmd,
AL_CNT_CRLE) == NULL)
return (INSCFG_RET_FAIL);
@@ -906,7 +823,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
}
}
- if ((crle->c_flags & CRLE_UPDATE) == 0)
+ if (((crle->c_flags & CRLE_UPDATE) == 0) && cmdset)
printcmd(crle, head, cmdline);
if ((crle->c_flags & CRLE_VERBOSE) == 0)
@@ -997,14 +914,6 @@ inspectconfig(Crle_desc * crle, int c_class)
if (fablib(crle, CRLE_ESLIB))
return (INSCFG_RET_FAIL);
}
- if (crle->c_flags & CRLE_ADLIB) {
- if (fablib(crle, CRLE_ADLIB))
- return (INSCFG_RET_FAIL);
- }
- if (crle->c_flags & CRLE_ASLIB) {
- if (fablib(crle, CRLE_ASLIB))
- return (INSCFG_RET_FAIL);
- }
return (INSCFG_RET_OK);
} else if (crle->c_flags & CRLE_CONFDEF) {
@@ -1025,18 +934,13 @@ inspectconfig(Crle_desc * crle, int c_class)
CONV_FMT_ALT_FILE, &inv_buf3));
- if (crle->c_flags & CRLE_AOUT) {
- fmt1 = MSG_INTL(MSG_DEF_AOUTDLP);
- fmt2 = MSG_INTL(MSG_DEF_AOUTNEWTD);
- } else {
#if M_CLASS == ELFCLASS64
- fmt1 = MSG_INTL(MSG_DEF_NEWDLP_64);
- fmt2 = MSG_INTL(MSG_DEF_NEWTD_64);
+ fmt1 = MSG_INTL(MSG_DEF_NEWDLP_64);
+ fmt2 = MSG_INTL(MSG_DEF_NEWTD_64);
#else
- fmt1 = MSG_INTL(MSG_DEF_NEWDLP);
- fmt2 = MSG_INTL(MSG_DEF_NEWTD);
+ fmt1 = MSG_INTL(MSG_DEF_NEWDLP);
+ fmt2 = MSG_INTL(MSG_DEF_NEWTD);
#endif
- }
(void) printf(fmt1);
(void) printf(fmt2);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-05 16:49:23 +0000