X-Git-Url: http://git.subgeniuskitty.com/pforth/.git/blobdiff_plain/bb6b2dcdd9acffabfd373c4c3f6b64a9cc43f335..b3ad2602f4c6a2236081ed2d913d4e03892182a6:/csrc/pf_main.c

diff --git a/csrc/pf_main.c b/csrc/pf_main.c
index 9d8568d..df38d0c 100644
--- a/csrc/pf_main.c
+++ b/csrc/pf_main.c
@@ -66,14 +66,14 @@ int main( int argc, char **argv )
 	const char *SourceName = NULL;
 	char IfInit = FALSE;
 	char *s;
-	int32 i;
+	cell_t i;
 	int Result;
 
 /* For Metroworks on Mac */
 #ifdef __MWERKS__
 	argc = ccommand(&argv);
 #endif
-
+	
 /* Parse command line. */
 	for( i=1; i<argc; i++ )
 	{
@@ -90,13 +90,25 @@ int main( int argc, char **argv )
 				IfInit = TRUE;
 				DicName = NULL;
 				break;
+				
 			case 'q':
 				pfSetQuiet( TRUE );
 				break;
+				
 			case 'd':
 				if( *s != '\0' ) DicName = s;
-				else DicName = PF_DEFAULT_DICTIONARY;
+				// Allow space after -d (Thanks Aleksej Saushev)
+				// Make sure there is another argument.
+				else if( (i+1) < argc )
+				{
+					DicName = argv[++i];
+				}
+				if (DicName == NULL || *DicName == '\0')
+				{
+					DicName = PF_DEFAULT_DICTIONARY;
+				}
 				break;
+				
 			default:
 				ERR(("Unrecognized option!\n"));
 				ERR(("pforth {-i} {-q} {-dfilename.dic} {sourcefilename}\n"));