mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- on WIN32 wait for a key, whether we exit with an error or not.

Browse Source 
Before it would only wait if there was an error.
This commit is contained in:
Bryce Denney 2002-11-21 06:36:22 +00:00
parent 2146c8d1d2
commit 6409027423
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bochs/misc/bximage.c
View File

@ -1,6 +1,6 @@
/* /*
* misc/bximage.c * misc/bximage.c
* $Id: bximage.c,v 1.15 2002-11-15 18:14:08 bdenney Exp $ * $Id: bximage.c,v 1.16 2002-11-21 06:36:22 bdenney Exp $
* *
* Create empty hard disk or floppy disk images for bochs. * Create empty hard disk or floppy disk images for bochs.
* *
@ -17,7 +17,7 @@
#include "config.h" #include "config.h"
char *EOF_ERR = "ERROR: End of input"; char *EOF_ERR = "ERROR: End of input";
char *rcsid = "$Id: bximage.c,v 1.15 2002-11-15 18:14:08 bdenney Exp $"; char *rcsid = "$Id: bximage.c,v 1.16 2002-11-21 06:36:22 bdenney Exp $";
char *divider = "========================================================================"; char *divider = "========================================================================";
/* menu data for choosing floppy/hard disk */ /* menu data for choosing floppy/hard disk */
@ -30,6 +30,15 @@ char *fdsize_menu = "\nChoose the size of floppy disk image to create, in megaby
char *fdsize_choices[] = { "0.36","0.72","1.2","1.44","2.88" }; char *fdsize_choices[] = { "0.36","0.72","1.2","1.44","2.88" };
int fdsize_n_choices = 5; int fdsize_n_choices = 5;
void myexit (int code)
{
#ifdef WIN32
printf ("\nPress any key to continue\n");
getch();
#endif
exit(code);
}
/* stolen from main.cc */ /* stolen from main.cc */
void bx_center_print (FILE *file, char *line, int maxwidth) void bx_center_print (FILE *file, char *line, int maxwidth)
{ {
@ -54,11 +63,7 @@ print_banner ()
void fatal (char *c) void fatal (char *c)
{ {
printf ("%s\n", c); printf ("%s\n", c);
#ifdef WIN32 myexit (1);
printf ("\nPress any key to continue\n");
getch();
#endif
exit (1);
} }
/* remove leading spaces, newline junk at end. returns pointer to /* remove leading spaces, newline junk at end. returns pointer to
@ -302,5 +307,5 @@ int main()
printf ("\nI wrote %lld bytes to %s.\n", sectors*512, filename); printf ("\nI wrote %lld bytes to %s.\n", sectors*512, filename);
printf ("\nThe following line should appear in your bochsrc:\n"); printf ("\nThe following line should appear in your bochsrc:\n");
printf (" %s\n", bochsrc_line); printf (" %s\n", bochsrc_line);
return 0; myexit(0);
} }