Merge pull request #280 from akgrant43/FileAttributesPlugin133

akgrant43 · web-flow · commit 217e917cea38 · 2018-08-23T07:50:52.000+02:00
1.3.3: Add path encoding / decoding

MacOS uses custom decomposed UTF8 encoded strings for path names (while
precomposed Unicode strings are typically used within the image).
Encode and decode path names using the existing VM routines (ux2sqPath()
and sq2uxPath()).
diff --git a/build.macos32x86/pharo.cog.spur.lowcode/plugins.ext b/build.macos32x86/pharo.cog.spur.lowcode/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # could work, but I don't know if relevant:
 # TestOSAPlugin \
 # not working (because of Cocoa vs Carbon):
diff --git a/build.macos32x86/pharo.cog.spur.lowcode/plugins.int b/build.macos32x86/pharo.cog.spur.lowcode/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/pharo.cog.spur/plugins.ext b/build.macos32x86/pharo.cog.spur/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # TEMPORARY REMOVE
 # B3DAcceleratorPlugin \
 # could work, but I don't know if relevant:
diff --git a/build.macos32x86/pharo.cog.spur/plugins.int b/build.macos32x86/pharo.cog.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/pharo.sista.spur/plugins.ext b/build.macos32x86/pharo.sista.spur/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # TEMPORARY REMOVE
 # B3DAcceleratorPlugin \
 # could work, but I don't know if relevant:
diff --git a/build.macos32x86/pharo.sista.spur/plugins.int b/build.macos32x86/pharo.sista.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/pharo.stack.spur.lowcode/plugins.ext b/build.macos32x86/pharo.stack.spur.lowcode/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # could work, but I don't know if relevant:
 # TestOSAPlugin \
 # not working (because of Cocoa vs Carbon):
diff --git a/build.macos32x86/pharo.stack.spur.lowcode/plugins.int b/build.macos32x86/pharo.stack.spur.lowcode/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/pharo.stack.spur/plugins.ext b/build.macos32x86/pharo.stack.spur/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # could work, but I don't know if relevant:
 # TestOSAPlugin \
 # not working (because of Cocoa vs Carbon):
diff --git a/build.macos32x86/pharo.stack.spur/plugins.int b/build.macos32x86/pharo.stack.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.cog.spur+immutability/plugins.ext b/build.macos32x86/squeak.cog.spur+immutability/plugins.ext
@@ -4,7 +4,6 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 CameraPlugin \
-FileAttributesPlugin \
 GdbARMPlugin \
 CroquetPlugin \
 Mpeg3Plugin \
diff --git a/build.macos32x86/squeak.cog.spur+immutability/plugins.int b/build.macos32x86/squeak.cog.spur+immutability/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.cog.spur/plugins.ext b/build.macos32x86/squeak.cog.spur/plugins.ext
@@ -4,7 +4,6 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 CameraPlugin \
-FileAttributesPlugin \
 GdbARMPlugin \
 CroquetPlugin \
 Mpeg3Plugin \
diff --git a/build.macos32x86/squeak.cog.spur/plugins.int b/build.macos32x86/squeak.cog.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.cog.v3/plugins.ext b/build.macos32x86/squeak.cog.v3/plugins.ext
@@ -3,7 +3,6 @@ EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 CameraPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos32x86/squeak.cog.v3/plugins.int b/build.macos32x86/squeak.cog.v3/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.sista.spur/plugins.ext b/build.macos32x86/squeak.sista.spur/plugins.ext
@@ -4,7 +4,6 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 CameraPlugin \
-FileAttributesPlugin \
 GdbARMPlugin \
 CroquetPlugin \
 Mpeg3Plugin \
diff --git a/build.macos32x86/squeak.sista.spur/plugins.int b/build.macos32x86/squeak.sista.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.stack.spur/plugins.ext b/build.macos32x86/squeak.stack.spur/plugins.ext
@@ -3,7 +3,6 @@ EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 CameraPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos32x86/squeak.stack.spur/plugins.int b/build.macos32x86/squeak.stack.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos32x86/squeak.stack.v3/plugins.ext b/build.macos32x86/squeak.stack.v3/plugins.ext
@@ -3,7 +3,6 @@ EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 CameraPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos32x86/squeak.stack.v3/plugins.int b/build.macos32x86/squeak.stack.v3/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/pharo.cog.spur.lowcode/plugins.ext b/build.macos64x64/pharo.cog.spur.lowcode/plugins.ext
@@ -16,7 +16,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # Not working in 64bits (weird)
 # MIDIPlugin \
 # could work, but I don't know if relevant: \
diff --git a/build.macos64x64/pharo.cog.spur.lowcode/plugins.int b/build.macos64x64/pharo.cog.spur.lowcode/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/pharo.cog.spur/plugins.ext b/build.macos64x64/pharo.cog.spur/plugins.ext
@@ -16,7 +16,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # Not working in 64bits (weird)
 # MIDIPlugin \
 # could work, but I don't know if relevant: \
diff --git a/build.macos64x64/pharo.cog.spur/plugins.int b/build.macos64x64/pharo.cog.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/pharo.sista.spur/plugins.ext b/build.macos64x64/pharo.sista.spur/plugins.ext
@@ -16,7 +16,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # Not working in 64bits (weird)
 # MIDIPlugin \
 # could work, but I don't know if relevant: \
diff --git a/build.macos64x64/pharo.sista.spur/plugins.int b/build.macos64x64/pharo.sista.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/pharo.stack.spur.lowcode/plugins.ext b/build.macos64x64/pharo.stack.spur.lowcode/plugins.ext
@@ -16,7 +16,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # Not working in 64bits (weird)
 # MIDIPlugin \
 # could work, but I don't know if relevant: \
diff --git a/build.macos64x64/pharo.stack.spur.lowcode/plugins.int b/build.macos64x64/pharo.stack.spur.lowcode/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/pharo.stack.spur/plugins.ext b/build.macos64x64/pharo.stack.spur/plugins.ext
@@ -16,7 +16,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # Not working in 64bits (weird)
 # MIDIPlugin \
 # could work, but I don't know if relevant: \
diff --git a/build.macos64x64/pharo.stack.spur/plugins.int b/build.macos64x64/pharo.stack.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/squeak.cog.spur.immutability/plugins.ext b/build.macos64x64/squeak.cog.spur.immutability/plugins.ext
@@ -5,7 +5,6 @@ BochsX64Plugin \
 GdbARMPlugin \
 B3DAcceleratorPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos64x64/squeak.cog.spur.immutability/plugins.int b/build.macos64x64/squeak.cog.spur.immutability/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/squeak.cog.spur/plugins.ext b/build.macos64x64/squeak.cog.spur/plugins.ext
@@ -5,7 +5,6 @@ BochsX64Plugin \
 GdbARMPlugin \
 B3DAcceleratorPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos64x64/squeak.cog.spur/plugins.int b/build.macos64x64/squeak.cog.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/squeak.sista.spur/plugins.ext b/build.macos64x64/squeak.sista.spur/plugins.ext
@@ -5,7 +5,6 @@ BochsX64Plugin \
 GdbARMPlugin \
 B3DAcceleratorPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos64x64/squeak.sista.spur/plugins.int b/build.macos64x64/squeak.sista.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/build.macos64x64/squeak.stack.spur/plugins.ext b/build.macos64x64/squeak.stack.spur/plugins.ext
@@ -2,7 +2,6 @@
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 CroquetPlugin \
-FileAttributesPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 Squeak3D \
diff --git a/build.macos64x64/squeak.stack.spur/plugins.int b/build.macos64x64/squeak.stack.spur/plugins.int
@@ -11,6 +11,7 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
 HostWindowPlugin \
diff --git a/platforms/iOS/plugins/FileAttributesPlugin/Makefile b/platforms/iOS/plugins/FileAttributesPlugin/Makefile
@@ -0,0 +1,10 @@
+#
+# FileAttributesPlugin uses sq2uxPath() and ux2sqPath(), provided by sqUnixCharConv.h
+#
+#
+SRCDIRS:=../../platforms/unix/vm
+INCDIRS:=../../platforms/unix/vm
+LIBSRC:=FileAttributesPlugin.c sqUnixCharConv.c
+
+include ../common/Makefile.plugin
+
diff --git a/src/plugins/FileAttributesPlugin/FileAttributesPlugin.c b/src/plugins/FileAttributesPlugin/FileAttributesPlugin.c
