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

Code cleanup for ports

Browse Source
This commit is contained in:
Michiel Broek
2005-01-07 21:46:24 +00:00
parent e5457c6187
commit 8149bb99f6
10 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mbsetup/m_global.c
View File

@@ -1691,14 +1691,14 @@ int global_doc(FILE *fp, FILE *toc, int page)
if (uname(&utsbuf) == 0) {
add_webtable(wp, (char *)"Node name", utsbuf.nodename);
fprintf(fp, " Node name %s\n", utsbuf.nodename);
#ifdef __USE_GNU
#if defined(__USE_GNU)
add_webtable(wp, (char *)"Domain name", utsbuf.domainname);
fprintf(fp, " Domain name %s\n", utsbuf.domainname);
#else
#ifdef __linux__
#elif defined(__linux__)
add_webtable(wp, (char *)"Domain name", utsbuf.__domainname);
fprintf(fp, " Domain name %s\n", utsbuf.__domainname);
#endif
#else
#error "Don't know utsbuf.domainname on this OS"
#endif
sprintf(temp, "%s %s", utsbuf.sysname, utsbuf.release);
add_webtable(wp, (char *)"Operating system", temp);

26
mbsetup/m_tty.c
View File

@@ -140,17 +140,16 @@ int CountTtyinfo(void)
for (i = 0; i < 4; i++) {
memset(&ttyinfo, 0, sizeof(ttyinfo));
sprintf(ttyinfo.comment, "ISDN line %d", i+1);
#ifdef __linux__
#if defined(__linux__)
sprintf(ttyinfo.tty, "ttyI%d", i);
#endif
#ifdef __FreeBSD__
#elif defined(__FreeBSD__)
sprintf(ttyinfo.tty, "cuaia%d", i);
#endif
#ifdef __NetBSD__
#elif defined(__NetBSD__)
sprintf(ttyinfo.tty, "ttyi%c", i + 'a'); // NetBSD on a Sparc, how about PC's?
#endif
#ifdef __OpenBSD__
#elif defined(__OpenBSD__)
sprintf(ttyinfo.tty, "cuaia%d", i); // I think this is wrong!
#else
#error "Don't know the tty name for ISDN on this OS"
#endif
sprintf(ttyinfo.speed, "64 kbits");
sprintf(ttyinfo.flags, "XA,X75,CM");
@@ -166,17 +165,16 @@ int CountTtyinfo(void)
for (i = 0; i < 4; i++) {
memset(&ttyinfo, 0, sizeof(ttyinfo));
sprintf(ttyinfo.comment, "Modem line %d", i+1);
#ifdef __linux__
#if defined(__linux__)
sprintf(ttyinfo.tty, "ttyS%d", i);
#endif
#ifdef __FreeBSD__
#elif defined(__FreeBSD__)
sprintf(ttyinfo.tty, "cuaa%d", i);
#endif
#ifdef __NetBSD__
#elif defined(__NetBSD__)
sprintf(ttyinfo.tty, "tty%c", i + 'a'); // NetBSD on a Sparc, how about PC's?
#endif
#ifdef __OpenBSD__
#elif defined(__OpenBSD__)
sprintf(ttyinfo.tty, "tty0%d", i);
#else
#error "Don't know the tty name of the serial ports on this OS"
#endif
sprintf(ttyinfo.speed, "33.6 kbits");
sprintf(ttyinfo.flags, "CM,XA,V32B,V42B,V34");