Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Changed snprintf copies to use strncpy at the suggestion of Aaron Lehmann.

Browse Source
This commit is contained in:
Matt Kraai 2001-05-18 21:24:58 +00:00
parent d6ef07406d
commit 1844770fec
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
init.c
View File

@ -328,7 +328,7 @@ static void console_init()
} }
if ((s = getenv("CONSOLE")) != NULL) { if ((s = getenv("CONSOLE")) != NULL) {
snprintf(console, sizeof(console) - 1, "%s", s); safe_strncpy(console, s, sizeof(console));
} }
#if #cpu(sparc) #if #cpu(sparc)
/* sparc kernel supports console=tty[ab] parameter which is also /* sparc kernel supports console=tty[ab] parameter which is also
@ -336,9 +336,9 @@ static void console_init()
else if ((s = getenv("console")) != NULL) { else if ((s = getenv("console")) != NULL) {
/* remap tty[ab] to /dev/ttyS[01] */ /* remap tty[ab] to /dev/ttyS[01] */
if (strcmp(s, "ttya") == 0) if (strcmp(s, "ttya") == 0)
snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON0); safe_strncpy(console, SERIAL_CON0, sizeof(console));
else if (strcmp(s, "ttyb") == 0) else if (strcmp(s, "ttyb") == 0)
snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON1); safe_strncpy(console, SERIAL_CON1, sizeof(console));
} }
#endif #endif
else { else {
@ -351,7 +351,7 @@ static void console_init()
snprintf(console, sizeof(console) - 1, "/dev/tty%d", snprintf(console, sizeof(console) - 1, "/dev/tty%d",
vt.v_active); vt.v_active);
} else { } else {
snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
tried_devcons++; tried_devcons++;
} }
} }
@ -360,20 +360,20 @@ static void console_init()
/* Can't open selected console -- try /dev/console */ /* Can't open selected console -- try /dev/console */
if (!tried_devcons) { if (!tried_devcons) {
tried_devcons++; tried_devcons++;
snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
continue; continue;
} }
/* Can't open selected console -- try vt1 */ /* Can't open selected console -- try vt1 */
if (!tried_vtprimary) { if (!tried_vtprimary) {
tried_vtprimary++; tried_vtprimary++;
snprintf(console, sizeof(console) - 1, "%s", VT_PRIMARY); safe_strncpy(console, VT_PRIMARY, sizeof(console));
continue; continue;
} }
break; break;
} }
if (fd < 0) { if (fd < 0) {
/* Perhaps we should panic here? */ /* Perhaps we should panic here? */
snprintf(console, sizeof(console) - 1, "/dev/null"); safe_strncpy(console, "/dev/null", sizeof(console));
} else { } else {
/* check for serial console and disable logging to tty5 & running a /* check for serial console and disable logging to tty5 & running a
* shell to tty2-4 */ * shell to tty2-4 */
@ -385,7 +385,7 @@ static void console_init()
/* Force the TERM setting to vt102 for serial console -- /* Force the TERM setting to vt102 for serial console --
* iff TERM is set to linux (the default) */ * iff TERM is set to linux (the default) */
if (strcmp( termType, "TERM=linux" ) == 0) if (strcmp( termType, "TERM=linux" ) == 0)
snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); safe_strncpy(termType, "TERM=vt102", sizeof(termType));
message(LOG | CONSOLE, message(LOG | CONSOLE,
"serial console detected. Disabling virtual terminals.\r\n"); "serial console detected. Disabling virtual terminals.\r\n");
} }

16
init/init.c
View File

@ -328,7 +328,7 @@ static void console_init()
} }
if ((s = getenv("CONSOLE")) != NULL) { if ((s = getenv("CONSOLE")) != NULL) {
snprintf(console, sizeof(console) - 1, "%s", s); safe_strncpy(console, s, sizeof(console));
} }
#if #cpu(sparc) #if #cpu(sparc)
/* sparc kernel supports console=tty[ab] parameter which is also /* sparc kernel supports console=tty[ab] parameter which is also
@ -336,9 +336,9 @@ static void console_init()
else if ((s = getenv("console")) != NULL) { else if ((s = getenv("console")) != NULL) {
/* remap tty[ab] to /dev/ttyS[01] */ /* remap tty[ab] to /dev/ttyS[01] */
if (strcmp(s, "ttya") == 0) if (strcmp(s, "ttya") == 0)
snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON0); safe_strncpy(console, SERIAL_CON0, sizeof(console));
else if (strcmp(s, "ttyb") == 0) else if (strcmp(s, "ttyb") == 0)
snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON1); safe_strncpy(console, SERIAL_CON1, sizeof(console));
} }
#endif #endif
else { else {
@ -351,7 +351,7 @@ static void console_init()
snprintf(console, sizeof(console) - 1, "/dev/tty%d", snprintf(console, sizeof(console) - 1, "/dev/tty%d",
vt.v_active); vt.v_active);
} else { } else {
snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
tried_devcons++; tried_devcons++;
} }
} }
@ -360,20 +360,20 @@ static void console_init()
/* Can't open selected console -- try /dev/console */ /* Can't open selected console -- try /dev/console */
if (!tried_devcons) { if (!tried_devcons) {
tried_devcons++; tried_devcons++;
snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); safe_strncpy(console, _PATH_CONSOLE, sizeof(console));
continue; continue;
} }
/* Can't open selected console -- try vt1 */ /* Can't open selected console -- try vt1 */
if (!tried_vtprimary) { if (!tried_vtprimary) {
tried_vtprimary++; tried_vtprimary++;
snprintf(console, sizeof(console) - 1, "%s", VT_PRIMARY); safe_strncpy(console, VT_PRIMARY, sizeof(console));
continue; continue;
} }
break; break;
} }
if (fd < 0) { if (fd < 0) {
/* Perhaps we should panic here? */ /* Perhaps we should panic here? */
snprintf(console, sizeof(console) - 1, "/dev/null"); safe_strncpy(console, "/dev/null", sizeof(console));
} else { } else {
/* check for serial console and disable logging to tty5 & running a /* check for serial console and disable logging to tty5 & running a
* shell to tty2-4 */ * shell to tty2-4 */
@ -385,7 +385,7 @@ static void console_init()
/* Force the TERM setting to vt102 for serial console -- /* Force the TERM setting to vt102 for serial console --
* iff TERM is set to linux (the default) */ * iff TERM is set to linux (the default) */
if (strcmp( termType, "TERM=linux" ) == 0) if (strcmp( termType, "TERM=linux" ) == 0)
snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); safe_strncpy(termType, "TERM=vt102", sizeof(termType));
message(LOG | CONSOLE, message(LOG | CONSOLE,
"serial console detected. Disabling virtual terminals.\r\n"); "serial console detected. Disabling virtual terminals.\r\n");
} }