1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-26 03:51:32 +00:00

Remove FORKCOMM define. (#238)

This code path was followed everywhere except DOS, so remove
it from the build system, and adjust the code.
This commit is contained in:
Bruce Mitchener
2021-01-19 13:12:41 +07:00
committed by GitHub
parent c4e4c5ec5b
commit db6b351397
44 changed files with 45 additions and 60 deletions

View File

@@ -103,14 +103,12 @@ int main(int argc, char *argv[])
XCloseDisplay(Xdisplay);
strcpy(filetorun, LDEX);
#ifdef FORKCOMM
/* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
specified, of course... */
for (i = 0; i < argc; i++)
if (!strcmp(argv[i], "-NF")) break;
if (i == argc) /* -NF not in arguments */
fork_Unix();
#endif /* FORKCOMM */
argv[0] = filetorun;
execvp(filetorun, argv);
@@ -181,14 +179,12 @@ int main(int argc, char *argv[])
#endif /* USESUNSCREEN */
#ifdef FORKCOMM
/* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
specified, of course... */
for (i = 0; i < argc; i++)
if (!strcmp(argv[i], "-NF")) break;
if (i == argc) /* -NF not in arguments */
fork_Unix();
#endif
/* start ldemono or ldecolor */

View File

@@ -496,7 +496,9 @@ int main(int argc, char *argv[])
init_ether(); /* modified by kiuchi Nov. 4 */
#endif /* MAIKO_ENABLE_ETHERNET */
#ifdef FORKCOMM
#ifdef DOS
init_host_filesystem();
#else
/* Fork Unix was called in kickstarter; if we forked, look up the */
/* pipe handles to the subprocess and set them up. */
@@ -504,20 +506,8 @@ int main(int argc, char *argv[])
{ /* in case we're re-starting a savevm w/open ptys */
if (please_fork) fprintf(stderr, "Failed to find UNIXCOMM file handles; no processes\n");
}
#else
/* Fork Unix Interface subprocess before we create anything big; */
/* interrupts need to be blocked here so subprocess won't see them */
/* This should actually live in the kickstarter... */
#ifdef DOS
init_host_filesystem();
#else
if (please_fork) {
int_block();
fork_Unix();
}
#endif /* DOS */
#endif /* FORKCOMM */
#if defined(DOS) || defined(XWINDOW)
make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
#endif /* DOS || XWINDOW */