Changeset 200

Timestamp:

Aug 10, 2002, 4:40:23 PM (23 years ago)

Author:

umoeller

Message:

More fixes.

Location:

trunk

Files:

• include/helpers/dosh.h (modified) (1 diff)
• src/helpers/dosh2.c (modified) (3 diffs)
• src/helpers/gpih.c (modified) (1 diff)
• src/helpers/winh.c (modified) (1 diff)

trunk/include/helpers/dosh.h

@@ -843 +843 @@
     typedef struct _PARTITIONINFO
     {
-        BYTE    bDisk;                 // drive number
-        CHAR    cLetter;               // probable drive letter or ' ' if none
-        BYTE    bFSType;               // file system type
-        PCSZ    pcszFSType;            // file system name (as returned by
-                                       // doshType2FSName, can be NULL!)
-        BOOL    fPrimary;              // primary partition?
-        BOOL    fBootable;             // bootable by Boot Manager?
-        CHAR    szBootName[9];         // Boot Manager name, if (fBootable)
-        ULONG   ulSize;                // size MBytes
-        PPARTITIONINFO pNext;        // next info or NULL if last
+        BYTE    bDisk;                  // drive number
+        CHAR    cLetter;                // probable drive letter or ' ' if none
+        BYTE    bFSType;                // file system type
+        PCSZ    pcszFSType;             // file system name (as returned by
+                                        // doshType2FSName, can be NULL!)
+        BOOL    fPrimary;               // primary partition?
+        BOOL    fBootable;              // bootable by Boot Manager?
+        CHAR    szBootName[21];         // Boot Manager name, if (fBootable)
+                                        // extended for LVM names V0.9.20 (2002-08-10) [umoeller]
+        ULONG   ulSize;                 // size MBytes
+        PPARTITIONINFO pNext;           // next info or NULL if last
     } PARTITIONINFO;
 

trunk/src/helpers/dosh2.c

@@ -782 +782 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: fixed truncated LVM names
  */
 
@@ -796 +797 @@
 {
     APIRET arc = NO_ERROR;
-    PPARTITIONINFO ppiNew = NEW(PARTITIONINFO);
-    if (ppiNew)
+    PPARTITIONINFO ppiNew;
+    if (ppiNew = NEW(PARTITIONINFO))
     {
         ZERO(ppiNew);
@@ -803 +804 @@
         // store data
         ppiNew->bDisk = bDisk;
-        if ((fBootable) && (pszBootName) )
+        if (    (fBootable)
+             && (pszBootName)
+           )
         {
-            memcpy(ppiNew->szBootName, pszBootName, 8);
-            ppiNew->szBootName[8] = 0;
+            // fixed truncated LVM names V0.9.20 (2002-08-10) [umoeller]
+            strhncpy0(ppiNew->szBootName,
+                      pszBootName,
+                      sizeof(ppiNew->szBootName));
         }
         else

trunk/src/helpers/gpih.c

@@ -2380 +2380 @@
     }
 
-    return GpiWCBitBlt(hpsTarget,     // target HPS (bmp selected)
+    return GpiWCBitBlt(hpsTarget,       // target HPS (bmp selected)
                        hbmSource,
-                       4L,             // must always be 4
-                       &aptl[0],       // points array
+                       4L,              // must always be 4
+                       &aptl[0],        // points array
                        ROP_SRCCOPY,
                        BBO_IGNORE);

trunk/src/helpers/winh.c

@@ -4394 +4394 @@
     ulCharHeight = gpihQueryLineSpacing(hps);
 
-    while (   (lDrawn)
-           && (lTotalDrawn < ulTextLen)
+    while (    (lDrawn)
+            && (lTotalDrawn < ulTextLen)
           )
     {