Changeset 14 for trunk/src/helpers/eah.c

Timestamp:

Dec 9, 2000, 8:19:42 PM (25 years ago)

Author:

umoeller

Message:

Major updates; timers, LVM, miscellaneous.

File:

• trunk/src/helpers/eah.c (modified) (31 diffs)

trunk/src/helpers/eah.c

@@ -67 +67 @@
  *      Copyright (C) 1995 Massachusetts Institute of Technology.
  *      Copyright (C) 1997-2000 Ulrich M”ller.
- *      This file is part of the XWorkplace source package.
- *      XWorkplace is free software; you can redistribute it and/or modify
+ *      This file is part of the "XWorkplace helpers" source package.
+ *      This is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published
  *      by the Free Software Foundation, in version 2 as it comes in the
@@ -83 +83 @@
     // as unsigned char
 
-#define INCL_DOS
+#define INCL_DOSFILEMGR
 #define INCL_DOSERRORS
 #include <os2.h>
@@ -101 +101 @@
 
 /********************************************************************
- *                                                                  *
- *   Extended Attribute handling                                    *
- *                                                                  *
+ *
+ *   Extended Attribute handling
+ *
  ********************************************************************/
 
@@ -173 +173 @@
 
 /* ******************************************************************
- *                                                                  *
- *   Read-EA functions                                              *
- *                                                                  *
+ *
+ *   Read-EA functions
+ *
  ********************************************************************/
 
@@ -196 +196 @@
  */
 
-ULONG eaPathQueryTotalSize(PSZ pszPath)
+ULONG eaPathQueryTotalSize(const char *pcszPath)
 {
     APIRET  arc;
@@ -202 +202 @@
     FILEFINDBUF4   ffb4;
 
-    _Pmpf(("eaPathQueryTotalSize %s", pszPath));
-
-    arc = DosQueryPathInfo(pszPath,
+    arc = DosQueryPathInfo((PSZ)pcszPath,
                            FIL_QUERYEASIZE,
                            &ffb4,
@@ -220 +218 @@
 
         arc = DosEnumAttribute(ENUMEA_REFTYPE_PATH,
-                               pszPath,
+                               (PSZ)pcszPath,
                                1,
                                abBuf,
@@ -230 +228 @@
         pdena2 = (PDENA2)abBuf;
 
-        _Pmpf(("  %s: arc = %d, count = %d", pszPath, arc, lCount));
-
         if (lCount > 0)
         {
@@ -247 +243 @@
     }
 
-    _Pmpf(("    %s: total %d", pszPath, ulTotalEASize));
-
     return (ulTotalEASize);
 }
@@ -259 +253 @@
  */
 
-PEALIST eaPathReadAll(PSZ path)
-{
-    return (ReadEAList(ENUMEA_REFTYPE_PATH, path));
+PEALIST eaPathReadAll(const char *pcszPath)
+{
+    return (ReadEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath));
 }
 
@@ -283 +277 @@
  */
 
-PEABINDING eaPathReadOneByIndex(PSZ path, ULONG index)
-{
-    return (ReadEAByIndex(ENUMEA_REFTYPE_PATH, path, index));
+PEABINDING eaPathReadOneByIndex(const char *pcszPath, ULONG index)
+{
+    return (ReadEAByIndex(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, index));
 }
 
@@ -305 +299 @@
  */
 
-PEABINDING eaPathReadOneByName(PSZ path, PSZ name)
-{
-    return (ReadEAByName(ENUMEA_REFTYPE_PATH, path, name));
+PEABINDING eaPathReadOneByName(const char *pcszPath, const char *pcszEAName)
+{
+    return (ReadEAByName(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, (PSZ)pcszEAName));
 }
 
@@ -315 +309 @@
  */
 
-PEABINDING eaHFileReadOneByName(HFILE hfile, PSZ name)
-{
-    return (ReadEAByName(ENUMEA_REFTYPE_FHANDLE, (&hfile), name));
+PEABINDING eaHFileReadOneByName(HFILE hfile, const char *pcszEAName)
+{
+    return (ReadEAByName(ENUMEA_REFTYPE_FHANDLE, (&hfile), (PSZ)pcszEAName));
 }
 
 /* ******************************************************************
- *                                                                  *
- *   Write-EA functions                                             *
- *                                                                  *
+ *
+ *   Write-EA functions
+ *
  ********************************************************************/
 
@@ -335 +329 @@
  *      field is 0; only in that case, the EABINDING.value
  *      field may also be NULL.
- */
-
-void eaPathWriteAll(PSZ path, PEALIST list)
-{
-    WriteEAList(ENUMEA_REFTYPE_PATH, path, list);
+ *
+ *@@changed V0.9.7 (2000-11-30) [umoeller]: now returning APIRET
+ */
+
+APIRET eaPathWriteAll(const char *pcszPath, PEALIST list)
+{
+    return (WriteEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, list));
 }
 
@@ -345 +341 @@
  *@@ eaHFileWriteAll:
  *      like eaPathWriteAll, but for an open file handle.
- */
-
-void eaHFileWriteAll(HFILE hfile, PEALIST list)
-{
-    WriteEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile), list);
+ *
+ *@@changed V0.9.7 (2000-11-30) [umoeller]: now returning APIRET
+ */
+
+APIRET eaHFileWriteAll(HFILE hfile, PEALIST list)
+{
+    return (WriteEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile), list));
 }
 
@@ -362 +360 @@
  *
  *      To delete an EA, you may also use eaPathDeleteOne.
- */
-
-void eaPathWriteOne(PSZ path, PEABINDING peab)
-{
-    WriteEA(ENUMEA_REFTYPE_PATH, path, peab);
+ *
+ *@@changed V0.9.7 (2000-11-30) [umoeller]: now returning APIRET
+ */
+
+APIRET eaPathWriteOne(const char *pcszPath, PEABINDING peab)
+{
+    return (WriteEA(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, peab));
 }
 
@@ -372 +372 @@
  *@@ eaHFileWriteOne:
  *      like eaPathWriteOne, but for an open file handle.
- */
-
-void eaHFileWriteOne(HFILE hfile, PEABINDING peab)
-{
-    WriteEA(ENUMEA_REFTYPE_FHANDLE, (&hfile), peab);
+ *
+ *@@changed V0.9.7 (2000-11-30) [umoeller]: now returning APIRET
+ */
+
+APIRET eaHFileWriteOne(HFILE hfile, PEABINDING peab)
+{
+    return (WriteEA(ENUMEA_REFTYPE_FHANDLE, (&hfile), peab));
 }
 
@@ -386 +388 @@
  *
  *@@added V0.9.0 [umoeller]
- */
-
-void eaPathDeleteOne(PSZ path, PSZ pszEAName)
+ *@@changed V0.9.7 (2000-11-30) [umoeller]: now returning APIRET
+ */
+
+APIRET eaPathDeleteOne(const char *pcszPath, const char *pcszEAName)
 {
     EABINDING eab;
     eab.bFlags = 0;
-    eab.bNameLength = strlen(pszEAName);
-    eab.pszName = pszEAName;
+    eab.bNameLength = strlen(pcszEAName);
+    eab.pszName = (PSZ)pcszEAName;
     eab.usValueLength = 0;
     eab.pszValue = 0;
-    eaPathWriteOne(path, &eab);
+    return (eaPathWriteOne(pcszPath, &eab));
 }
 
@@ -404 +407 @@
 
 /********************************************************************
- *                                                                  *
- *   Translation funcs                                              *
- *                                                                  *
+ *
+ *   Translation funcs
+ *
  ********************************************************************/
 
@@ -484 +487 @@
  */
 
-PEABINDING eaCreateBindingFromPSZ(PSZ pszEAName,     // in: EA name (e.g. ".LONGNAME")
-                                  PSZ pszString)     // in: string for EAT_ASCII EA
+PEABINDING eaCreateBindingFromPSZ(const char *pcszEAName, // in: EA name (e.g. ".LONGNAME")
+                                  const char *pcszInput)  // in: string for EAT_ASCII EA
 {
     PEABINDING peab = (PEABINDING)malloc(sizeof(EABINDING));
@@ -491 +494 @@
     {
         SHORT cbString = 0;
-        if (pszString)
-            cbString = strlen(pszString);
+        if (pcszInput)
+            cbString = strlen(pcszInput);
 
         peab->bFlags = 0;
-        peab->bNameLength = strlen(pszEAName);
-        peab->pszName = strdup(pszEAName);
+        peab->bNameLength = strlen(pcszEAName);
+        peab->pszName = strdup(pcszEAName);
 
         if (cbString)
@@ -510 +513 @@
                 *((PUSHORT)(peab->pszValue + 2)) = cbString;
                 // copy string to byte 4 (no null-terminator)
-                memcpy(peab->pszValue + 4, pszString, cbString);
+                memcpy(peab->pszValue + 4, pcszInput, cbString);
             }
             else
@@ -743 +746 @@
 
 PSZ eaCreatePSZFromMVBinding(PEABINDING peab,       // in: EAT_MVMT binding
-                             PSZ     pszSeparator,  // in: null-terminated string used as separator
+                             const char *pcszSeparator,  // in: null-terminated string used as separator
                              PUSHORT pusCodepage)   // out: codepage found in binding (ptr can be NULL)
 {
@@ -765 +768 @@
             USHORT  us = 0;
             USHORT  cbComment = 0;
-            USHORT  cbSeparator = strlen(pszSeparator);
+            USHORT  cbSeparator = strlen(pcszSeparator);
             while (us < usMVCount)
             {
@@ -794 +797 @@
                             // append separator
                             memcpy(pszTotal + cbCommentOld,
-                                   pszSeparator,
+                                   pcszSeparator,
                                    cbSeparator);
                             // copy the rest after the separator (below)
@@ -846 +849 @@
  */
 
-PEABINDING eaCreateMVBindingFromPSZ(PSZ pszEAName,      // in: EA name (e.g. ".KEYPHRASES")
-                                    PSZ pszInput,       // in: string to parse
-                                    PSZ pszSeparator,   // in: separator used in pszInput
+PEABINDING eaCreateMVBindingFromPSZ(const char *pcszEAName,      // in: EA name (e.g. ".KEYPHRASES")
+                                    const char *pcszInput,       // in: string to parse
+                                    const char *pcszSeparator,   // in: separator used in pszInput
                                     USHORT usCodepage)  // in: codepage to set in EAT_MVMT
 {
     PEABINDING peab;
-    if (pszInput)
+    if (pcszInput)
     {
         peab = (PEABINDING)malloc(sizeof(EABINDING));
         if (peab)
         {
-            PSZ     p = pszInput,
-                    pSource,
-                    pTarget;
-            USHORT  cbInput = strlen(pszInput),
-                    cbSep = strlen(pszSeparator),
+            const char *p = pcszInput,
+                    *pSource;
+            PSZ     pTarget;
+            USHORT  cbInput = strlen(pcszInput),
+                    cbSep = strlen(pcszSeparator),
                     usSepCount = 0,
                     cbToAlloc = 0,
@@ -868 +871 @@
 
             peab->bFlags = 0;
-            peab->bNameLength = strlen(pszEAName);
-            peab->pszName = strdup(pszEAName);
+            peab->bNameLength = strlen(pcszEAName);
+            peab->pszName = strdup(pcszEAName);
 
             // now count the number of pszSeparators in pszInput
-            while ((p = strstr(p, pszSeparator)))
+            while ((p = strstr(p, pcszSeparator)))
             {
                 usSepCount++;
@@ -898 +901 @@
 
             // set pointer to first field
-            pSource = pszInput;
+            pSource = pcszInput;
             pTarget = peab->pszValue + 6;
 
@@ -907 +910 @@
             {
                 // find the next separator
-                PSZ     pNextSep = strstr(pSource, pszSeparator);
+                PSZ     pNextSep = strstr(pSource, pcszSeparator);
                 // calculate the length of the substring
                 cbThis = pNextSep - pSource;
@@ -934 +937 @@
 
 /********************************************************************
- *                                                                  *
- *   EA helper funcs                                                *
- *                                                                  *
+ *
+ *   EA helper funcs
+ *
  ********************************************************************/
 
@@ -1217 +1220 @@
 
 /* ******************************************************************
- *                                                                  *
- *   Direct plain-string EA handling                                *
- *                                                                  *
+ *
+ *   Direct plain-string EA handling
+ *
  ********************************************************************/