Renaming of the primitive + change return value

add ST code

Author: Vincent Blondeau

src/plugins/FilePlugin/FilePlugin.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator * VMMaker.oscog-VB.2370 uuid: b61408e0-effc-5144-bd81-993254392346
+	VMPluginCodeGenerator VMMaker.oscog-VB.2382 uuid: da8a5d36-0cd4-b641-865f-a139b3914245
    from
-	FilePlugin * VMMaker.oscog-VB.2370 uuid: b61408e0-effc-5144-bd81-993254392346
+	FilePlugin VMMaker.oscog-VB.2382 uuid: da8a5d36-0cd4-b641-865f-a139b3914245
  */
-static char __buildInfo[] = "FilePlugin * VMMaker.oscog-VB.2370 uuid: b61408e0-effc-5144-bd81-993254392346 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-VB.2382 uuid: da8a5d36-0cd4-b641-865f-a139b3914245 " __DATE__ ;
 
 
 
@@ -85,6 +85,7 @@ EXPORT(sqInt) primitiveDisableFileAccess(void);
 EXPORT(sqInt) primitiveFileAtEnd(void);
 EXPORT(sqInt) primitiveFileClose(void);
 EXPORT(sqInt) primitiveFileDelete(void);
+EXPORT(sqInt) primitiveFileDescriptorType(void);
 EXPORT(sqInt) primitiveFileFlush(void);
 EXPORT(sqInt) primitiveFileGetPosition(void);
 EXPORT(sqInt) primitiveFileOpen(void);
@@ -100,7 +101,6 @@ EXPORT(sqInt) primitiveFileSync(void);
 EXPORT(sqInt) primitiveFileTruncate(void);
 EXPORT(sqInt) primitiveFileWrite(void);
 EXPORT(sqInt) primitiveHasFileAccess(void);
-EXPORT(sqInt) primitiveIsFileDescriptorATTY(void);
 EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter);
 EXPORT(sqInt) setMacFileTypeAndCreator(char *fileName, char *typeString, char *creatorString);
 EXPORT(sqInt) shutdownModule(void);
@@ -144,6 +144,7 @@ static sqInt (*primitiveFail)(void);
 static sqInt (*primitiveFailFor)(sqInt reasonCode);
 static sqInt (*primitiveFailureCode)(void);
 static sqInt (*pushBool)(sqInt trueOrFalse);
+static sqInt (*pushInteger)(sqInt integerValue);
 static sqInt (*pushRemappableOop)(sqInt oop);
 static sqInt (*slotSizeOf)(sqInt oop);
 static sqInt (*stSizeOf)(sqInt oop);
@@ -177,8 +178,8 @@ extern sqInt integerValueOf(sqInt oop);
 extern void * ioLoadFunctionFrom(char *functionName, char *moduleName);
 extern sqInt isKindOf(sqInt oop, char *aString);
 extern sqInt isBytes(sqInt oop);
-extern sqInt isIntegerObject(sqInt objectPointer);
 #if !defined(isIntegerObject)
+extern sqInt isIntegerObject(sqInt objectPointer);
 #endif
 extern sqInt isWords(sqInt oop);
 extern sqInt isWordsOrBytes(sqInt oop);
@@ -195,6 +196,7 @@ extern sqInt primitiveFail(void);
 extern sqInt primitiveFailFor(sqInt reasonCode);
 extern sqInt primitiveFailureCode(void);
 extern sqInt pushBool(sqInt trueOrFalse);
+extern sqInt pushInteger(sqInt integerValue);
 extern sqInt pushRemappableOop(sqInt oop);
 extern sqInt slotSizeOf(sqInt oop);
 extern sqInt stSizeOf(sqInt oop);
@@ -209,9 +211,9 @@ extern
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FilePlugin * VMMaker.oscog-VB.2370 (i)"
+	"FilePlugin VMMaker.oscog-VB.2382 (i)"
 #else
-	"FilePlugin * VMMaker.oscog-VB.2370 (e)"
+	"FilePlugin VMMaker.oscog-VB.2382 (e)"
 #endif
 ;
 static void * sCCPfn;
@@ -1140,6 +1142,40 @@ primitiveFileDelete(void)
 	return 0;
 }
 
+
+/*	Allow to test if the standard input/output files are from a console or not
+	Return values:
+	* -1 - Error
+	* 0 - no console (windows only)
+	* 1 - normal terminal (unix terminal / windows console)
+	* 2 - pipe
+	* 3 - file
+	* 4 - cygwin terminal (windows only) */
+
+	/* FilePlugin>>#primitiveFileDescriptorType */
+EXPORT(sqInt)
+primitiveFileDescriptorType(void)
+{
+    int fd;
+    sqInt fdPointer;
+    sqInt fileType;
+
+	fdPointer = stackValue(0);
+	if (!(isIntegerObject(fdPointer))) {
+		return primitiveFailFor(PrimErrBadArgument);
+	}
+	fd = integerValueOf(fdPointer);
+	if (failed()) {
+
+		/* Ensure that the appropriate failure code has been set */
+		return primitiveFailFor(PrimErrBadArgument);
+	}
+	fileType = sqFileDescriptorType(fd);
+	pop(2);
+	pushInteger(fileType);
+	return 0;
+}
+
 	/* FilePlugin>>#primitiveFileFlush */
 EXPORT(sqInt)
 primitiveFileFlush(void)
@@ -1725,30 +1761,6 @@ primitiveHasFileAccess(void)
 	return 0;
 }
 
-	/* FilePlugin>>#primitiveIsFileDescriptorATTY */
-EXPORT(sqInt)
-primitiveIsFileDescriptorATTY(void)
-{
-    int fd;
-    sqInt fdPointer;
-    sqInt isStdoutRedirected;
-
-	fdPointer = stackValue(0);
-	if (!(isIntegerObject(fdPointer))) {
-		return primitiveFailFor(PrimErrBadArgument);
-	}
-	fd = integerValueOf(fdPointer);
-	if (failed()) {
-
-		/* Ensure that the appropriate failure code has been set */
-		return primitiveFailFor(PrimErrBadArgument);
-	}
-	isStdoutRedirected = sqIsFileDescriptorATTY(fd) ;
-	pop(2);
-	pushBool(isStdoutRedirected);
-	return 0;
-}
-
 
 /*	Note: This is coded so that it can be run in Squeak. */
 
@@ -1805,6 +1817,7 @@ setInterpreter(struct VirtualMachine*anInterpreter)
 		primitiveFailFor = interpreterProxy->primitiveFailFor;
 		primitiveFailureCode = interpreterProxy->primitiveFailureCode;
 		pushBool = interpreterProxy->pushBool;
+		pushInteger = interpreterProxy->pushInteger;
 		pushRemappableOop = interpreterProxy->pushRemappableOop;
 		slotSizeOf = interpreterProxy->slotSizeOf;
 		stSizeOf = interpreterProxy->stSizeOf;
@@ -1862,6 +1875,7 @@ void* FilePlugin_exports[][3] = {
 	{(void*)_m, "primitiveFileAtEnd\000\001", (void*)primitiveFileAtEnd},
 	{(void*)_m, "primitiveFileClose\000\001", (void*)primitiveFileClose},
 	{(void*)_m, "primitiveFileDelete\000\001", (void*)primitiveFileDelete},
+	{(void*)_m, "primitiveFileDescriptorType\000\000", (void*)primitiveFileDescriptorType},
 	{(void*)_m, "primitiveFileFlush\000\001", (void*)primitiveFileFlush},
 	{(void*)_m, "primitiveFileGetPosition\000\001", (void*)primitiveFileGetPosition},
 	{(void*)_m, "primitiveFileOpen\000\002", (void*)primitiveFileOpen},
@@ -1875,7 +1889,6 @@ void* FilePlugin_exports[][3] = {
 	{(void*)_m, "primitiveFileTruncate\000\001", (void*)primitiveFileTruncate},
 	{(void*)_m, "primitiveFileWrite\000\001", (void*)primitiveFileWrite},
 	{(void*)_m, "primitiveHasFileAccess\000\377", (void*)primitiveHasFileAccess},
-	{(void*)_m, "primitiveIsFileDescriptorATTY\000\000", (void*)primitiveIsFileDescriptorATTY},
 	{(void*)_m, "setInterpreter", (void*)setInterpreter},
 	{(void*)_m, "setMacFileTypeAndCreator", (void*)setMacFileTypeAndCreator},
 	{(void*)_m, "shutdownModule\000\377", (void*)shutdownModule},
@@ -1895,6 +1908,7 @@ signed char primitiveDirectorySetMacTypeAndCreatorAccessorDepth = 1;
 signed char primitiveFileAtEndAccessorDepth = 1;
 signed char primitiveFileCloseAccessorDepth = 1;
 signed char primitiveFileDeleteAccessorDepth = 1;
+signed char primitiveFileDescriptorTypeAccessorDepth = 0;
 signed char primitiveFileFlushAccessorDepth = 1;
 signed char primitiveFileGetPositionAccessorDepth = 1;
 signed char primitiveFileOpenAccessorDepth = 2;
@@ -1906,6 +1920,5 @@ signed char primitiveFileSizeAccessorDepth = 1;
 signed char primitiveFileSyncAccessorDepth = 1;
 signed char primitiveFileTruncateAccessorDepth = 1;
 signed char primitiveFileWriteAccessorDepth = 1;
-signed char primitiveIsFileDescriptorATTYAccessorDepth = 0;
 
 #endif /* ifdef SQ_BUILTIN_PLUGIN */