bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed default ttys creation

Browse Source
This commit is contained in:
Michiel Broek 2004-12-29 14:58:38 +00:00
parent 3496239a1e
commit faec864516
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -51,8 +51,9 @@ v0.71.1 28-Nov-2004
mbsetup: mbsetup:
Added support for XxxxBSD console port. Added support for XxxxBSD console port.
For new systems, there will now be 20 terminal ports created For new systems, there will now be 16 terminal ports created
instead of 10. instead of 10, this is the maximum number of safe created ttys.
The ttys are now sorted on the comment fields.
examples: examples:
Removed bbs list items from the English menus and txtfiles and Removed bbs list items from the English menus and txtfiles and

25
mbsetup/m_tty.c
View File

@ -56,7 +56,6 @@ int CountTtyinfo(void)
sprintf(ffile, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT")); sprintf(ffile, "%s/etc/ttyinfo.data", getenv("MBSE_ROOT"));
if ((fil = fopen(ffile, "r")) == NULL) { if ((fil = fopen(ffile, "r")) == NULL) {
if ((fil = fopen(ffile, "a+")) != NULL) { if ((fil = fopen(ffile, "a+")) != NULL) {
Syslog('+', "Creaded new %s", ffile);
ttyinfohdr.hdrsize = sizeof(ttyinfohdr); ttyinfohdr.hdrsize = sizeof(ttyinfohdr);
ttyinfohdr.recsize = sizeof(ttyinfo); ttyinfohdr.recsize = sizeof(ttyinfo);
fwrite(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil); fwrite(&ttyinfohdr, sizeof(ttyinfohdr), 1, fil);
@ -65,34 +64,31 @@ int CountTtyinfo(void)
/* /*
* Only seen on Linux systems * Only seen on Linux systems
*/ */
for (i = 0; i < 20; i++) { for (i = 0; i < 16; i++) {
count++;
memset(&ttyinfo, 0, sizeof(ttyinfo)); memset(&ttyinfo, 0, sizeof(ttyinfo));
sprintf(ttyinfo.comment, "Network port %d", i+11); sprintf(ttyinfo.comment, "Network port %d", count);
sprintf(ttyinfo.tty, "pts/%d", i); sprintf(ttyinfo.tty, "pts/%d", i);
sprintf(ttyinfo.speed, "10 mbit"); sprintf(ttyinfo.speed, "10 mbit");
sprintf(ttyinfo.flags, "IBN,IFC,XX"); sprintf(ttyinfo.flags, "IBN,IFC,XX");
ttyinfo.type = NETWORK; ttyinfo.type = NETWORK;
ttyinfo.available = TRUE; ttyinfo.available = TRUE;
sprintf(ttyinfo.name, "Network port #%d", i+11); sprintf(ttyinfo.name, "Network port #%d", count);
fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil);
count++;
} }
#endif #endif
for (i = 0; i < 20; i++) { for (i = 0; i < 16; i++) {
count++;
memset(&ttyinfo, 0, sizeof(ttyinfo)); memset(&ttyinfo, 0, sizeof(ttyinfo));
sprintf(ttyinfo.comment, "Network port %d", i+1); sprintf(ttyinfo.comment, "Network port %d", count);
if (i > 9) sprintf(ttyinfo.tty, "ttyp%x", i);
sprintf(ttyinfo.tty, "ttyp%c", (i - 10) + 'a');
else
sprintf(ttyinfo.tty, "ttyp%d", i);
sprintf(ttyinfo.speed, "10 mbit"); sprintf(ttyinfo.speed, "10 mbit");
sprintf(ttyinfo.flags, "IBN,IFC,XX"); sprintf(ttyinfo.flags, "IBN,IFC,XX");
ttyinfo.type = NETWORK; ttyinfo.type = NETWORK;
ttyinfo.available = TRUE; ttyinfo.available = TRUE;
sprintf(ttyinfo.name, "Network port #%d", i+1); sprintf(ttyinfo.name, "Network port #%d", count);
fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil); fwrite(&ttyinfo, sizeof(ttyinfo), 1, fil);
count++;
} }
#if defined(__linux__) #if defined(__linux__)
@ -200,6 +196,7 @@ int CountTtyinfo(void)
fclose(fil); fclose(fil);
chmod(ffile, 0640); chmod(ffile, 0640);
Syslog('+', "Creaded new %s with %d ttys", ffile, count);
return count; return count;
} else } else
return -1; return -1;
@ -289,7 +286,7 @@ void CloseTtyinfo(int force)
while (fread(&ttyinfo, ttyinfohdr.recsize, 1, fi) == 1) while (fread(&ttyinfo, ttyinfohdr.recsize, 1, fi) == 1)
if (!ttyinfo.deleted) if (!ttyinfo.deleted)
fill_stlist(&tty, ttyinfo.tty, ftell(fi) - ttyinfohdr.recsize); fill_stlist(&tty, ttyinfo.comment, ftell(fi) - ttyinfohdr.recsize);
sort_stlist(&tty); sort_stlist(&tty);
for (tmp = tty; tmp; tmp = tmp->next) { for (tmp = tty; tmp; tmp = tmp->next) {