m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Modified mountlist.c to operate on MacOSX.

Browse Source 
- Also fixed a bug in init.c: !strcmp(Liste_points_montage->me_mountdir,"/") && !strcmp(Liste_points_montage->me_mountdir,"/home") should have been
strcmp(Liste_points_montage->me_mountdir,"/") && strcmp(Liste_points_montage->me_mountdir,"/home")
since root & home are already added before (strcmp returns 0 if strings match).

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@473 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2009-01-11 03:26:03 +00:00
parent cd1c720029
commit 7c4d2675ad
6 changed files with 152 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

12
Grafx2.xcodeproj/project.pbxproj
View File

@ -19,6 +19,7 @@
F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AD4B1E0EA8CCF0009CCAC4 /* version.c */; }; F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AD4B1E0EA8CCF0009CCAC4 /* version.c */; };
F5AE6F990EDA119D000CE0EF /* GrafX2_Classic.gif in Copy fonts */ = {isa = PBXBuildFile; fileRef = F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */; }; F5AE6F990EDA119D000CE0EF /* GrafX2_Classic.gif in Copy fonts */ = {isa = PBXBuildFile; fileRef = F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */; };
F5AE83FD0ECF8FD300200704 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */; }; F5AE83FD0ECF8FD300200704 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */; };
F5AED03E0F1989E00090A93F /* mountlist.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AED03C0F1989E00090A93F /* mountlist.c */; };
F5AFA00D0EFAC7D300663B43 /* brush.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0070EFAC7D300663B43 /* brush.c */; }; F5AFA00D0EFAC7D300663B43 /* brush.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0070EFAC7D300663B43 /* brush.c */; };
F5AFA00E0EFAC7D300663B43 /* pxsimple.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0080EFAC7D300663B43 /* pxsimple.c */; }; F5AFA00E0EFAC7D300663B43 /* pxsimple.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0080EFAC7D300663B43 /* pxsimple.c */; };
F5AFA00F0EFAC7D300663B43 /* pxtall.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0090EFAC7D300663B43 /* pxtall.c */; }; F5AFA00F0EFAC7D300663B43 /* pxtall.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0090EFAC7D300663B43 /* pxtall.c */; };
@ -128,6 +129,7 @@
F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; }; F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; };
F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = GrafX2_Classic.gif; path = fonts/GrafX2_Classic.gif; sourceTree = "<group>"; }; F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = GrafX2_Classic.gif; path = fonts/GrafX2_Classic.gif; sourceTree = "<group>"; };
F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
F5AED03C0F1989E00090A93F /* mountlist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = mountlist.c; sourceTree = "<group>"; };
F5AFA0070EFAC7D300663B43 /* brush.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = brush.c; sourceTree = "<group>"; }; F5AFA0070EFAC7D300663B43 /* brush.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = brush.c; sourceTree = "<group>"; };
F5AFA0080EFAC7D300663B43 /* pxsimple.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxsimple.c; sourceTree = "<group>"; }; F5AFA0080EFAC7D300663B43 /* pxsimple.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxsimple.c; sourceTree = "<group>"; };
F5AFA0090EFAC7D300663B43 /* pxtall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxtall.c; sourceTree = "<group>"; }; F5AFA0090EFAC7D300663B43 /* pxtall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxtall.c; sourceTree = "<group>"; };
@ -225,6 +227,7 @@
29B97314FDCFA39411CA2CEA /* Grafx2 */ = { 29B97314FDCFA39411CA2CEA /* Grafx2 */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F5AED03C0F1989E00090A93F /* mountlist.c */,
F5AFA0070EFAC7D300663B43 /* brush.c */, F5AFA0070EFAC7D300663B43 /* brush.c */,
F5AFA0080EFAC7D300663B43 /* pxsimple.c */, F5AFA0080EFAC7D300663B43 /* pxsimple.c */,
F5AFA0090EFAC7D300663B43 /* pxtall.c */, F5AFA0090EFAC7D300663B43 /* pxtall.c */,
@ -396,6 +399,7 @@
F5AFA0100EFAC7D300663B43 /* pxwide.c in Sources */, F5AFA0100EFAC7D300663B43 /* pxwide.c in Sources */,
F5AFA0110EFAC7D300663B43 /* setup.c in Sources */, F5AFA0110EFAC7D300663B43 /* setup.c in Sources */,
F5AFA0120EFAC7D300663B43 /* windows.c in Sources */, F5AFA0120EFAC7D300663B43 /* windows.c in Sources */,
F5AED03E0F1989E00090A93F /* mountlist.c in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -428,6 +432,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
__macosx__,
__linux__,
);
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
@ -463,6 +471,10 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\""; FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS = (
__macosx__,
__linux__,
);
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (

14
Grafx2.xcodeproj/xx.pbxuser
View File

@ -77,7 +77,7 @@
43, 43,
20, 20,
79, 79,
110, 587,
); );
PBXFileTableDataSourceColumnsKey = ( PBXFileTableDataSourceColumnsKey = (
PBXFileDataSource_FiletypeID, PBXFileDataSource_FiletypeID,
@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 251761415; PBXPerProjectTemplateStateSaveDate = 253331600;
PBXWorkspaceStateSaveDate = 251761415; PBXWorkspaceStateSaveDate = 253331600;
}; };
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = { userBuildSettings = {
@ -184,6 +184,14 @@
sepNavWindowFrame = "{{15, 76}, {906, 665}}"; sepNavWindowFrame = "{{15, 76}, {906, 665}}";
}; };
}; };
F5AED03C0F1989E00090A93F /* mountlist.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {867, 17252}}";
sepNavSelRange = "{4702, 50}";
sepNavVisRect = "{{0, 2973}, {867, 536}}";
sepNavWindowFrame = "{{15, 76}, {906, 665}}";
};
};
F5B138930EB71977000B83CC /* texte.c */ = { F5B138930EB71977000B83CC /* texte.c */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {932, 8455}}"; sepNavIntBoundsRect = "{{0, 0}, {932, 8455}}";

109
Grafx2.xcodeproj/xx.perspective
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>ActivePerspectiveName</key> <key>ActivePerspectiveName</key>
<string>Project</string> <string>Build</string>
<key>AllowedModules</key> <key>AllowedModules</key>
<array> <array>
<dict> <dict>
@ -188,9 +188,9 @@
<array/> <array/>
<key>PerspectiveWidths</key> <key>PerspectiveWidths</key>
<array> <array>
<integer>953</integer> <integer>1469</integer>
<integer>953</integer> <integer>1469</integer>
<integer>953</integer> <integer>1469</integer>
</array> </array>
<key>Perspectives</key> <key>Perspectives</key>
<array> <array>
@ -264,12 +264,12 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array> <array>
<array> <array>
<integer>9</integer> <integer>1</integer>
<integer>0</integer> <integer>0</integer>
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {305, 387}}</string> <string>{{0, 0}, {305, 402}}</string>
</dict> </dict>
<key>PBXTopSmartGroupGIDs</key> <key>PBXTopSmartGroupGIDs</key>
<array/> <array/>
@ -279,14 +279,12 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {322, 405}}</string> <string>{{0, 0}, {322, 420}}</string>
<key>GroupTreeTableConfiguration</key> <key>GroupTreeTableConfiguration</key>
<array> <array>
<string>MainColumn</string> <string>MainColumn</string>
<real>305</real> <real>305</real>
</array> </array>
<key>RubberWindowFrame</key>
<string>14 169 992 446 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXSmartGroupTreeModule</string> <string>PBXSmartGroupTreeModule</string>
@ -323,9 +321,7 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {665, 0}}</string> <string>{{0, 0}, {1142, 0}}</string>
<key>RubberWindowFrame</key>
<string>14 169 992 446 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXNavigatorGroup</string> <string>PBXNavigatorGroup</string>
@ -334,12 +330,10 @@
</dict> </dict>
<dict> <dict>
<key>Proportion</key> <key>Proportion</key>
<string>400pt</string> <string>415pt</string>
<key>Tabs</key> <key>Tabs</key>
<array> <array>
<dict> <dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
<dict> <dict>
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
@ -350,9 +344,7 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {665, 373}}</string> <string>{{10, 27}, {1142, 388}}</string>
<key>RubberWindowFrame</key>
<string>14 169 992 446 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>XCDetailModule</string> <string>XCDetailModule</string>
@ -393,7 +385,7 @@
</dict> </dict>
</array> </array>
<key>Proportion</key> <key>Proportion</key>
<string>665pt</string> <string>1142pt</string>
</dict> </dict>
</array> </array>
<key>Name</key> <key>Name</key>
@ -411,11 +403,11 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5ADFF250F0180EF0008467A</string> <string>F5AED0690F1999120090A93F</string>
<string>1CA23ED40692098700951B8B</string> <string>1CA23ED40692098700951B8B</string>
<string>F5ADFF260F0180EF0008467A</string> <string>F5AED06A0F1999120090A93F</string>
<string>F5A33EBD0EC89C3000F8052D</string> <string>F5A33EBD0EC89C3000F8052D</string>
<string>F5ADFF270F0180EF0008467A</string> <string>F5AED06B0F1999120090A93F</string>
<string>1CA23EDF0692099D00951B8B</string> <string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string>
@ -463,7 +455,7 @@
<dict> <dict>
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key> <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array> <array>
<real>123</real> <real>252</real>
</array> </array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key> <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array> <array>
@ -481,7 +473,7 @@
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {0, 0}}</string> <string>{{0, 0}, {252, 402}}</string>
</dict> </dict>
<key>PBXTopSmartGroupGIDs</key> <key>PBXTopSmartGroupGIDs</key>
<array/> <array/>
@ -491,17 +483,19 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {140, 554}}</string> <string>{{0, 0}, {269, 420}}</string>
<key>GroupTreeTableConfiguration</key> <key>GroupTreeTableConfiguration</key>
<array> <array>
<string>MainColumn</string> <string>MainColumn</string>
<real>123</real> <real>252</real>
</array> </array>
<key>RubberWindowFrame</key>
<string>-288 -7 1469 461 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXSmartGroupTreeModule</string> <string>PBXSmartGroupTreeModule</string>
<key>Proportion</key> <key>Proportion</key>
<string>140pt</string> <string>269pt</string>
</dict> </dict>
<dict> <dict>
<key>Dock</key> <key>Dock</key>
@ -512,7 +506,7 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>F5A33EC20EC89C3000F8052D</string> <string>F5A33EC20EC89C3000F8052D</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>asm pthread_mutex_lock 0x90001a38</string> <string></string>
<key>PBXSplitModuleInNavigatorKey</key> <key>PBXSplitModuleInNavigatorKey</key>
<dict> <dict>
<key>Split0</key> <key>Split0</key>
@ -520,7 +514,7 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>F5A33EC30EC89C3000F8052D</string> <string>F5A33EC30EC89C3000F8052D</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>asm pthread_mutex_lock 0x90001a38</string> <string></string>
</dict> </dict>
<key>SplitCount</key> <key>SplitCount</key>
<string>1</string> <string>1</string>
@ -533,7 +527,9 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {808, 0}}</string> <string>{{0, 0}, {1195, 0}}</string>
<key>RubberWindowFrame</key>
<string>-288 -7 1469 461 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXNavigatorGroup</string> <string>PBXNavigatorGroup</string>
@ -542,10 +538,12 @@
</dict> </dict>
<dict> <dict>
<key>Proportion</key> <key>Proportion</key>
<string>0pt</string> <string>415pt</string>
<key>Tabs</key> <key>Tabs</key>
<array> <array>
<dict> <dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
<dict> <dict>
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
@ -560,7 +558,9 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {0, -27}}</string> <string>{{10, 27}, {1195, 388}}</string>
<key>RubberWindowFrame</key>
<string>-288 -7 1469 461 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXBuildResultsModule</string> <string>PBXBuildResultsModule</string>
@ -622,7 +622,7 @@
</dict> </dict>
</array> </array>
<key>Proportion</key> <key>Proportion</key>
<string>0pt</string> <string>1195pt</string>
</dict> </dict>
</array> </array>
<key>Name</key> <key>Name</key>
@ -640,14 +640,14 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5ADFF280F0180EF0008467A</string> <string>F5AED06C0F1999130090A93F</string>
<string>1CA23EE50692099D00951B8B</string> <string>1CA23EE50692099D00951B8B</string>
<string>F5ADFF290F0180EF0008467A</string> <string>F5AED06D0F1999130090A93F</string>
<string>F5A33EC20EC89C3000F8052D</string> <string>F5A33EC20EC89C3000F8052D</string>
<string>F5ADFF2A0F0180EF0008467A</string> <string>F5AED06E0F1999130090A93F</string>
<string>XCMainBuildResultsModuleGUID</string> <string>XCMainBuildResultsModuleGUID</string>
<string>1CA23EE80692099D00951B8B</string> <string>1CA23EE80692099D00951B8B</string>
<string>F5ADFF2B0F0180EF0008467A</string> <string>F5AED06F0F1999130090A93F</string>
</array> </array>
<key>ToolbarConfiguration</key> <key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildAndRun</string> <string>xcode.toolbar.config.buildAndRun</string>
@ -691,12 +691,12 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {977, 174}}</string> <string>{{0, 0}, {1323, 0}}</string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXDebugCLIModule</string> <string>PBXDebugCLIModule</string>
<key>Proportion</key> <key>Proportion</key>
<string>174pt</string> <string>0pt</string>
</dict> </dict>
<dict> <dict>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
@ -715,8 +715,8 @@
<string>yes</string> <string>yes</string>
<key>sizes</key> <key>sizes</key>
<array> <array>
<string>{{0, 0}, {474, 215}}</string> <string>{{0, 0}, {641, 197}}</string>
<string>{{474, 0}, {503, 215}}</string> <string>{{641, 0}, {682, 197}}</string>
</array> </array>
</dict> </dict>
<key>VerticalSplitView</key> <key>VerticalSplitView</key>
@ -731,8 +731,8 @@
<string>yes</string> <string>yes</string>
<key>sizes</key> <key>sizes</key>
<array> <array>
<string>{{0, 0}, {977, 215}}</string> <string>{{0, 0}, {1323, 197}}</string>
<string>{{0, 215}, {977, 228}}</string> <string>{{0, 197}, {1323, 211}}</string>
</array> </array>
</dict> </dict>
</dict> </dict>
@ -754,12 +754,12 @@
<key>DebugSTDIOWindowFrame</key> <key>DebugSTDIOWindowFrame</key>
<string>{{200, 200}, {500, 300}}</string> <string>{{200, 200}, {500, 300}}</string>
<key>Frame</key> <key>Frame</key>
<string>{{0, 179}, {977, 443}}</string> <string>{{0, 5}, {1323, 408}}</string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXDebugSessionModule</string> <string>PBXDebugSessionModule</string>
<key>Proportion</key> <key>Proportion</key>
<string>443pt</string> <string>408pt</string>
</dict> </dict>
</array> </array>
<key>Name</key> <key>Name</key>
@ -778,15 +778,15 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5A33EF20EC89FAD00F8052D</string> <string>F5AED0700F1999130090A93F</string>
<string>1CCC7628064C1048000F2A68</string> <string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string> <string>1CCC7629064C1048000F2A68</string>
<string>F5A33EF30EC89FAD00F8052D</string> <string>F5AED0710F1999130090A93F</string>
<string>F5A33EF40EC89FAD00F8052D</string> <string>F5AED0720F1999130090A93F</string>
<string>F5A33EF50EC89FAD00F8052D</string> <string>F5AED0730F1999130090A93F</string>
<string>F5A33EF60EC89FAD00F8052D</string> <string>F5AED0740F1999130090A93F</string>
<string>F5A33EE10EC89F6100F8052D</string> <string>F5AED0410F1989EC0090A93F</string>
<string>F5A33EF70EC89FAD00F8052D</string> <string>F5AED0750F1999130090A93F</string>
</array> </array>
<key>ToolbarConfiguration</key> <key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debug</string> <string>xcode.toolbar.config.debug</string>
@ -795,7 +795,7 @@
<key>PerspectivesBarVisible</key> <key>PerspectivesBarVisible</key>
<true/> <true/>
<key>PinnedNavigatorIdentifier</key> <key>PinnedNavigatorIdentifier</key>
<string>F5AE852A0ECFA27900200704</string> <string>F5AED0670F1998B10090A93F</string>
<key>ShelfIsVisible</key> <key>ShelfIsVisible</key>
<false/> <false/>
<key>SourceDescription</key> <key>SourceDescription</key>
@ -818,10 +818,11 @@
<integer>5</integer> <integer>5</integer>
<key>WindowOrderList</key> <key>WindowOrderList</key>
<array> <array>
<string>F5AED0750F1999130090A93F</string>
<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string> <string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
</array> </array>
<key>WindowString</key> <key>WindowString</key>
<string>14 169 992 446 0 0 1024 746 </string> <string>-288 -7 1469 461 0 0 1024 746 </string>
<key>WindowTools</key> <key>WindowTools</key>
<array> <array>
<dict> <dict>

4
init.c
View File

@ -161,14 +161,16 @@ void Rechercher_drives(void)
while(Liste_points_montage != NULL) while(Liste_points_montage != NULL)
{ {
if(Liste_points_montage -> me_dummy == 0 && !strcmp(Liste_points_montage->me_mountdir,"/") && !strcmp(Liste_points_montage->me_mountdir,"/home")) if(Liste_points_montage->me_dummy == 0 && strcmp(Liste_points_montage->me_mountdir,"/") && strcmp(Liste_points_montage->me_mountdir,"/home"))
{ {
Ajouter_lecteur(lettre++, Ajouter_lecteur(lettre++,
Liste_points_montage->me_remote==1?LECTEUR_NETWORK:LECTEUR_HDD, Liste_points_montage->me_remote==1?LECTEUR_NETWORK:LECTEUR_HDD,
Liste_points_montage->me_mountdir); Liste_points_montage->me_mountdir);
} }
next = Liste_points_montage -> me_next; next = Liste_points_montage -> me_next;
#ifndef __macosx__
free(Liste_points_montage -> me_type); free(Liste_points_montage -> me_type);
#endif
free(Liste_points_montage); free(Liste_points_montage);
Liste_points_montage = next; Liste_points_montage = next;
} }

58
mountlist.c
View File

@ -19,7 +19,11 @@
#if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__)) #if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__))
// We don't use autoconf and all that in grafx2, so let's do the config here ... // We don't use autoconf and all that in grafx2, so let's do the config here ...
#ifdef __macosx__ // MacOS X is POSIX compliant
#define MOUNTED_GETMNTINFO
#else
#define MOUNTED_GETMNTENT1 #define MOUNTED_GETMNTENT1
#endif
// --- END GRAFX2 CUSTOM CONFIG --- // --- END GRAFX2 CUSTOM CONFIG ---
#include "mountlist.h" #include "mountlist.h"
@ -151,6 +155,26 @@
#undef closedir #undef closedir
#ifndef ME_DUMMY #ifndef ME_DUMMY
#ifdef __macosx__
# define ME_DUMMY(Fs_name, Fs_type) \
(strcmp (Fs_type, "autofs") == 0 \
|| strcmp (Fs_type, "none") == 0 \
|| strcmp (Fs_type, "proc") == 0 \
|| strcmp (Fs_type, "subfs") == 0 \
|| strcmp (Fs_type, "sysfs") == 0 \
|| strcmp (Fs_type, "usbfs") == 0 \
|| strcmp (Fs_type, "devpts") == 0 \
|| strcmp (Fs_type, "tmpfs") == 0 \
/* for NetBSD 3.0 */ \
|| strcmp (Fs_type, "kernfs") == 0 \
/* for Irix 6.5 */ \
|| strcmp (Fs_type, "ignore") == 0 \
/* for MacOSX */ \
|| strcmp (Fs_type, "devfs") == 0 \
|| strcmp (Fs_type, "fdesc") == 0 \
|| strcmp (Fs_type, "nfs") == 0 \
|| strcmp (Fs_type, "volfs") == 0)
#else
# define ME_DUMMY(Fs_name, Fs_type) \ # define ME_DUMMY(Fs_name, Fs_type) \
(strcmp (Fs_type, "autofs") == 0 \ (strcmp (Fs_type, "autofs") == 0 \
|| strcmp (Fs_type, "none") == 0 \ || strcmp (Fs_type, "none") == 0 \
@ -165,6 +189,7 @@
/* for Irix 6.5 */ \ /* for Irix 6.5 */ \
|| strcmp (Fs_type, "ignore") == 0) || strcmp (Fs_type, "ignore") == 0)
#endif #endif
#endif // ME_DUMMY
#ifndef ME_REMOTE #ifndef ME_REMOTE
/* A file system is `remote' if its Fs_name contains a `:' /* A file system is `remote' if its Fs_name contains a `:'
@ -177,7 +202,7 @@
|| strcmp (Fs_type, "cifs") == 0))) || strcmp (Fs_type, "cifs") == 0)))
#endif #endif
#if MOUNTED_GETMNTINFO #ifdef MOUNTED_GETMNTINFO
# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
static char * static char *
@ -413,7 +438,35 @@ read_file_system_list (bool need_fs_type)
} }
#endif /* MOUNTED_GETMNTENT1. */ #endif /* MOUNTED_GETMNTENT1. */
#ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */
#ifdef __macosx__
{
struct statfs *fsp;
int entries;
int i;
entries = getmntinfo (&fsp, MNT_NOWAIT);
if (entries < 0)
return NULL;
for (i = 0; i < entries; i++)
{
me = malloc (sizeof *me);
me->me_devname = strdup (fsp->f_mntfromname);
me->me_mountdir = strdup (fsp->f_mntonname);
me->me_type = fsp->f_fstypename;
me->me_type_malloced = 0;
me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
/* Add to the linked list. */
*mtail = me;
mtail = &me->me_next;
fsp++;
}
}
#else
{ {
struct statfs *fsp; struct statfs *fsp;
int entries; int entries;
@ -439,8 +492,10 @@ read_file_system_list (bool need_fs_type)
mtail = &me->me_next; mtail = &me->me_next;
} }
} }
#endif
#endif /* MOUNTED_GETMNTINFO */ #endif /* MOUNTED_GETMNTINFO */
#ifdef MOUNTED_GETMNTINFO2 /* NetBSD 3.0. */ #ifdef MOUNTED_GETMNTINFO2 /* NetBSD 3.0. */
{ {
struct statvfs *fsp; struct statvfs *fsp;
@ -456,6 +511,7 @@ read_file_system_list (bool need_fs_type)
me->me_mountdir = xstrdup (fsp->f_mntonname); me->me_mountdir = xstrdup (fsp->f_mntonname);
me->me_type = xstrdup (fsp->f_fstypename); me->me_type = xstrdup (fsp->f_fstypename);
me->me_type_malloced = 1; me->me_type_malloced = 1;
prtinf("device: %s\n", me->me_devname);
me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_remote = ME_REMOTE (me->me_devname, me->me_type); me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */