Changeset 2867 for trunk/kLdr/kLdrHlp.c

Timestamp:

Nov 11, 2006, 10:33:17 AM (19 years ago)

Author:

bird

Message:

top half of the filesearching is done.

File:

• trunk/kLdr/kLdrHlp.c (modified) (4 diffs)

trunk/kLdr/kLdrHlp.c

@@ -385 +385 @@
  * Get an environment variable.
  *
- * @returns 0 on success, on failure an OS specific status code is returned.
+ * @returns 0 on success.
+ * @returns KLDR_ERR_BUFFER_OVERFLOW on if the buffer is too small (it'll be partially filled).
+ * @returns KLDR_ERR_SYMBOL_NOT_FOUND if not found. (Yeah, abusing the status code, but it's only internally...)
+ * @returns OS specfic status code on other error.
  * @param   pszVar      The variable name.
- * @param   pszVal      Where to store the value. NULL is allowed if *pcchVal is 0.
- * @param   pcchVal     On input the size of the buffer pointed to by pszVal.
- *                      On output this contains the string length on success, while on
- *                      failure (including buffer overflow) the require buffer size.
- *                      If the variable wasn't found, it's set to 0.
- */
-int     kldrHlpGetEnv(const char *pszVar, char *pszVal, size_t *pcchVal)
+ * @param   pszVal      Where to store the value.
+ * @param   cchVal      The size of the buffer pointed to by pszVal.
+ */
+int     kldrHlpGetEnv(const char *pszVar, char *pszVal, size_t cchVal)
 {
 #ifdef __OS2__
     PSZ pszValue = NULL;
-    int rc = DosScanEnv((PCSZ)pszVar, &pszValue);
+    int rc;
+
+    *pszVal = '\0';
+    rc = DosScanEnv((PCSZ)pszVar, &pszValue);
     if (!rc)
     {
         size_t cch = kLdrHlpStrLen(pszValue);
-        if (pszVal)
-        {
-            if (*pcchVal > cch)
-            {
-                kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
-                *pcchVal = cch;
-            }
-            else if (*pcchVal)
+        if (cchVal > cch)
+            kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
+        else
+        {
+            rc = KLDR_ERR_BUFFER_OVERFLOW;
+            if (cchVal > 1)
             {
                 kLdrHlpMemCopy(pszVal, pszValue, *pcchVal);
                 pszVal[*pcchVal - 1] = '\0';
-                rc = ERROR_BUFFER_OVERFLOW;
-                *pcchVal = cch + 1;
             }
         }
-        else
-        {
-            rc = ERROR_BUFFER_OVERFLOW;
-            *pcchVal = cch + 1;
-        }
     }
     else
-    {
-        if (pszVal)
-            *pszVal = '\0';
-        *pcchVal = 0;
-    }
-
+        rc = KLDR_ERR_SYMBOL_NOT_FOUND;
     return rc;
 
 #elif defined(__WIN__)
     DWORD cch;
+
     SetLastError(0);
-    cch = GetEnvironmentVariable(pszVar, pszVal, *pcchVal);
-    if (cch)
-    {
-        *pcchVal = cch;
+    cch = GetEnvironmentVariable(pszVar, pszVal, cchVal);
+    if (cch < cchVal)
         return 0;
-    }
-    if (!GetLastError() == ERROR_ENVVAR_NOT_FOUND)
-    {
-        *pcchVal = 0;
-        return ERROR_ENVVAR_NOT_FOUND;
-    }
-    *pcchVal = cch;
-    return ERROR_BUFFER_OVERFLOW;
+
+    *pszVal = '\0';
+    if (cch >= cchVal)
+        return KLDR_ERR_BUFFER_OVERFLOW;
+    if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
+        return KLDR_ERR_SYMBOL_NOT_FOUND;
+    return GetLastError();
 
 #else
@@ -458 +445 @@
  *
  * @returns 0 and *pcb on success.
- *          Some non-zero OS or kLdr status code on failure.
+ * @returns On failure see kldrHlpGetEnv.
  * @param   pszVar  The name of the variable.
  * @param   pcb     Where to put the value.
@@ -472 +459 @@
 
     *pcb = 0;
-    rc = kldrHlpGetEnv(pszVar, szVal,  &cchVal);
+    rc = kldrHlpGetEnv(pszVar, szVal, cchVal);
     if (rc)
         return rc;
@@ -602 +589 @@
 
 
+/**
+ * Checks if this is only a filename or if it contains any kind
+ * of drive, directory, or server specs.
+ *
+ * @returns 1 if this is a filename only.
+ * @returns 0 of it's isn't only a filename.
+ * @param   pszFilename     The filename to parse.
+ */
+int kldrHlpIsFilenameOnly(const char *pszFilename)
+{
+    const char *pszLast = NULL;
+    for (;;)
+    {
+        const char ch = *pszFilename++;
+#if defined(__OS2__) || defined(__WIN__)
+        if (ch == '/' || ch == '\\' || ch == ':')
+#else
+        if (ch == '/')
+#endif
+            return 0;
+        if (!ch)
+            return 1;
+    }
+}
+
 
 /**