Changeset 555

Timestamp:

Mar 4, 2007, 6:01:14 AM (18 years ago)

Author:

Gregg Young

Message:

Added NTFS support (read only); minor dive icon code cleanup; update help files

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• fm3dll.h (modified) (1 diff)
• init.c (modified) (1 diff)
• ipf/context.ipf (modified) (2 diffs)
• ipf/eas.ipf (modified) (2 diffs)
• ipf/notebook.ipf (modified) (4 diffs)
• misc.c (modified) (1 diff)
• treecnr.c (modified) (5 diffs)
• valid.c (modified) (6 diffs)

trunk/dll/filldir.c

@@ -1040 +1040 @@
              driveflags[x] &= ~DRIVE_REMOTE;
             }
+            if (!stricmp(FileSystem,NTFS))
+             driveflags[x] |= DRIVE_NOTWRITEABLE;
             if (strcmp(FileSystem, HPFS) &&
                 strcmp(FileSystem, JFS) &&
@@ -1047 +1049 @@
                 strcmp(FileSystem, NDFS32) &&
                 strcmp(FileSystem, RAMFS) &&
+                strcmp(FileSystem, NTFS) &&
                 strcmp(FileSystem, HPFS386)) {
               driveflags[x] |= DRIVE_NOLONGNAMES;
@@ -1087 +1090 @@
                   suggest[1] = 0;
                 }
-                sprintf(suggest + strlen(suggest), "%c", toupper(*szDrive));
+                sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
                 strcpy(pci->szFileName, szDrive);
                 pci->pszFileName = pci->szFileName;

trunk/dll/fm3dll.h

@@ -1361 +1361 @@
   *DRMDRFLIST, *DRMDRFOS2FILE, *DRMDRFFM2ARC,
   *DRM_FM2INIRECORD, *DRF_FM2INI, *SUBJECT, *LONGNAME,
-  *HPFS, *JFS, *CDFS, *FAT32, *HPFS386, *NDFS32, *CBSIFS, *ISOFS, *RAMFS,
+  *HPFS, *JFS, *CDFS, *FAT32, *HPFS386, *NDFS32, *CBSIFS, *ISOFS, *RAMFS, *NTFS,
   *WPProgram, *FM3Folder, *FM3Tools;
 DATADEF RGB2 RGBGREY, RGBBLACK;

trunk/dll/init.c

@@ -220 +220 @@
     NDFS32 = "NDFS32";
     RAMFS = "RAMFS";
+    NTFS = "NTFS";
     /* end of strings */
     memset(&RGBBLACK, 0, sizeof(RGB2));

trunk/dll/ipf/context.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2006 Steven H.Levine
+.* Copyright (c) 2006-07 Steven H.Levine
 .*
 .* 01 Sep 06 GKY ADD new partition disks information
+.* 03 Mar 07 GKY Update that file systems other than HPFS support long names
 .*
 .***********************************************************************
@@ -571 +572 @@
 based on several criteria. You can also tell FM/2 to always display
 directories ahead of or behind files. Note that :hp1.Last access
-date:ehp1. and :hp1.Creation date:ehp1. are only meaningful for HPFS
-file systems; FAT file systems do not track this information. The
-difference between :hp1.Pathname:ehp1. and :hp1.Filename:ehp1. is only
+date:ehp1. and :hp1.Creation date:ehp1. are not tracked by the FAT file system
+The difference between :hp1.Pathname:ehp1. and :hp1.Filename:ehp1. is only
 apparent in the Collector. With the former, the entire pathname of the
 object is used to sort. With the latter, only the filename portion is

trunk/dll/ipf/eas.ipf

@@ +1 @@
+.***********************************************************************
+.*
+.* $Id$
+.*
+.* Extended Atribute Usage
+.*
+.* Copyright (c) 1993-98 M. Kimes
+.* Copyright (c) 2006-07 Steven H.Levine
+.*
+.* 03 Mar 07 GKY Update that file systems other than HPFS support long names
+.*
+.***********************************************************************
+.*
 :h2 res=95000 name=PANEL_EAS.Extended Attributes
 :i1 id=aboutEAs.Extended Attributes
@@ -88 +101 @@
 :hp1..LONGNAME:ehp1. is an ASCII attribute that gives the full name of a
 file when stored on a file system that doesn't support long filenames
-(like FAT). Sometimes you'll see them even on files stored on HPFS
-drives, when invalid characters (invalid for the file system, like
+(like FAT). Sometimes you'll see them even on files stored on drives that
+support long names, when invalid characters (invalid for the file system, like
 a colon not used for a path separator, for example) are used.
 :p.

trunk/dll/ipf/notebook.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2006 Steven H.Levine
+.* Copyright (c) 2006-07 Steven H.Levine
 .*
 .* 30 Dec 06 GKY Corrected statement re copy/move "toggle" in OS/2
+.* 03 Mar 07 GKY Update that file systems other than HPFS support long names
 .*
 .***********************************************************************
@@ -172 +173 @@
 You can also tell FM/2 to always display directories ahead of or behind
 files. Note that :hp1.Last access date:ehp1. and :hp1.Creation
-date:ehp1. are only meaningful for HPFS file systems; FAT file systems
-do not track this information. The difference between
+date:ehp1. are not tracked on FAT file systems. The difference between
 :hp1.Pathname:ehp1. and :hp1.Filename:ehp1. is only apparent in the
 Collector. With the former, the entire pathname of the object is used
@@ -233 +233 @@
 You can also tell FM/2 to always display directories ahead of or behind
 files. Note that :hp1.Last access date:ehp1. and :hp1.Creation
-date:ehp1. are only meaningful for HPFS file systems; FAT file systems
-do not track this information. The difference between
+date:ehp1. are not tracked on FAT file systems. The difference between
 :hp1.Pathname:ehp1. and :hp1.Filename:ehp1. is only apparent in the
 Collector. With the former, the entire pathname of the object is used
@@ -654 +653 @@
 :p.
 If :hp6.Load Longnames:ehp6. is checked, FM/2 loads the .LONGNAME
-extended attribute for non-HPFS drives. This attribute usually contains
+extended attribute for drives that don't have native support for long file names
+(ie FAT). This attribute usually contains
 a long name for objects that should be restored if the object is moved
-to an HPFS drive. As for Subject, Longnames are only shown in the
+to an HPFS/JFS drive. As for Subject, Longnames are only shown in the
 Details view. You can turn this off to marginally increase scanning
 speed. You can also adjust this on a drive-by-drive basis from the

trunk/dll/misc.c

@@ -350 +350 @@
         !stricmp(FileSystem, RAMFS) ||
         !stricmp(FileSystem, NDFS32) ||
+        !stricmp(FileSystem, NTFS) ||
         !stricmp(FileSystem, HPFS386)) {
       hasCreateDT = TRUE;

trunk/dll/treecnr.c

@@ -22 +22 @@
   29 Dec 06 GKY Fixed menu gray out for remote drives (added variable "remote")
   29 Dec 06 GKY Enabled edit of drive flags on "not ready" drives
-  18 Feb 07 GKY More drive type and inco support
+  18 Feb 07 GKY More drive type and icon support
 
 ***********************************************************************/
@@ -1774 +1774 @@
                                 DRIVE_NOLOADICONS | DRIVE_NOLOADSUBJS |
                                 DRIVE_NOLOADLONGS | DRIVE_INCLUDEFILES |
-                                DRIVE_SLOW) | DRIVE_NOSTATS;
+                                DRIVE_SLOW | DRIVE_NOSTATS);
 
               if (removable == 1)
@@ -1783 +1783 @@
                 driveflags[x] |= DRIVE_ZIPSTREAM;
                 driveflags[x] &= (~DRIVE_REMOTE);
+              }
               if(!strcmp(FileSystem,NDFS32)) {
                 driveflags[x] |= DRIVE_VIRTUAL;
@@ -1793 +1794 @@
               if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS))
                 driveflags[x] |= (DRIVE_REMOVABLE |
-                                  DRIVE_NOTWRITEABLE | DRIVE_CDROM);
+                                  DRIVE_NOTWRITEABLE | DRIVE_CDROM);
+              if(!strcmp(FileSystem,NTFS))
+                driveflags[x] |= DRIVE_NOTWRITEABLE;
               if (strcmp(FileSystem, HPFS) &&
                   strcmp(FileSystem, JFS) &&
@@ -1801 +1804 @@
                   strcmp(FileSystem, FAT32) &&
                   strcmp(FileSystem, NDFS32) &&
+                  strcmp(FileSystem, NTFS) &&
                   strcmp(FileSystem, HPFS386)) {
                 driveflags[x] |= DRIVE_NOLONGNAMES;
-              }
-
               }
               if (driveflags[x] & DRIVE_CDROM)

trunk/dll/valid.c

@@ -244 +244 @@
 
   if (pulType && (!strcmp(pfsn, CDFS) || !strcmp(pfsn, ISOFS)))
-    *pulType |= DRIVE_NOTWRITEABLE | DRIVE_CDROM | DRIVE_REMOVABLE;
+      *pulType |= DRIVE_NOTWRITEABLE | DRIVE_CDROM | DRIVE_REMOVABLE;
+  if (pulType && !strcmp(pfsn, NTFS))
+      *pulType |= DRIVE_NOTWRITEABLE;
   if (pulType && !strcmp(pfsn, NDFS32)){
         *pulType |= DRIVE_VIRTUAL;
@@ -252 +254 @@
     }
   if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV &&
-      (strcmp(pfsn, CDFS) && strcmp(pfsn, ISOFS))) {
+      (strcmp(pfsn, CDFS) || strcmp(pfsn, ISOFS))) {
     if (pulType)
       *pulType |= DRIVE_REMOTE;
@@ -278 +280 @@
          !strcmp(pfsn, RAMFS) ||
          !strcmp(pfsn, NDFS32) ||
+         !strcmp(pfsn, NTFS) ||
          !strcmp(pfsn, HPFS386))) {
       *pulType &= ~DRIVE_NOLONGNAMES;
@@ -294 +297 @@
       strcmp(pfsn, FAT32) &&
       strcmp(pfsn, NDFS32) &&
+      strcmp(pfsn, NTFS) &&
       strcmp(pfsn, HPFS386)) {
     if (pulType)
@@ -642 +646 @@
     driveflags[x] &= (~DRIVE_REMOTE);
   }
+  if(!stricmp(FileSystem,NTFS))
+    driveflags[x] |= DRIVE_NOTWRITEABLE;
   if (strcmp(FileSystem, HPFS) &&
       strcmp(FileSystem, JFS) &&
@@ -648 +654 @@
       strcmp(FileSystem, RAMFS) &&
       strcmp(FileSystem, FAT32) &&
+      strcmp(FileSystem, NTFS) &&
+      strcmp(FileSystem, NDFS32) &&
       strcmp(FileSystem, HPFS386)) {
     driveflags[x] |= DRIVE_NOLONGNAMES;