You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2001/04/12 19:49:34 UTC

cvs commit: apache-1.3/src/main http_main.c

bnicholes    01/04/12 10:49:33

  Modified:    src/main http_main.c
  Log:
  Changed the initial screen handling for NetWare so that the -s parameter will
  properly destroy the Apache console screen and switch to the system
  console screen.  Also removed the call to clrscr() for NetWare so that any
  warning messages produced during startup are visible.
  
  Revision  Changes    Path
  1.535     +11 -2     apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.534
  retrieving revision 1.535
  diff -u -r1.534 -r1.535
  --- http_main.c	2001/04/02 09:22:09	1.534
  +++ http_main.c	2001/04/12 17:49:26	1.535
  @@ -6834,7 +6834,17 @@
   #endif /* WIN32 */
   #ifdef NETWARE
           case 's':
  -            DestroyScreen(GetCurrentScreen());
  +            if (DestroyScreen(GetCurrentScreen()) == 0)
  +            {
  +                int screenHandle;  
  +   
  +                /* Create a screen handle for the console screen, 
  +                even though the console screen exists. */
  +                if ((screenHandle = CreateScreen("System Console", 0)) != NULL)
  +                {
  +                    SetCurrentScreen(screenHandle);  /* switch to console screen I/O */
  +                }
  +            }
               break;
   #endif
   	case 'S':
  @@ -7075,7 +7085,6 @@
           printf("%s running...\n", ap_get_server_version());
       }
   #elif defined(NETWARE)
  -    clrscr();
       printf("%s running...\n", ap_get_server_version());
   #endif