[Pcsclite-cvs-commit] PKCS11/src p11x_prefs.c,1.9,1.10

[rousseau@quantz.debian.org]

Update of /cvsroot/muscleapps/PKCS11/src
In directory quantz:/tmp/cvs-serv24700

Modified Files:
	p11x_prefs.c 
Log Message:
dos2unix conversion


Index: p11x_prefs.c
===================================================================
RCS file: /cvsroot/muscleapps/PKCS11/src/p11x_prefs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- p11x_prefs.c	4 Oct 2003 08:27:23 -0000	1.9
+++ p11x_prefs.c	4 Oct 2003 08:28:02 -0000	1.10
@@ -260,62 +260,62 @@
     }
 }
 
-/*
- * Returns the full pathname of the directory containing this DLL, including
- * the trailing slash or backslash.
- * It is the caller's responsibility to free() the buffer that is returned.
- */
-#ifdef WIN32
-static char*
-getDLLDirectory()
-{
-    char *buf=NULL;
-    const DWORD INCREMENT = 5;
-    DWORD avail = INCREMENT;
-    DWORD size, i;
-
-    do {
-        buf = (char*)malloc(avail+1); /* +1 for terminating NULL */
-        if( buf == NULL ) {
-            goto loser;
-        }
-        size = GetModuleFileName(NULL, buf, avail);
-        if( size == 0 ) {
-            /* function failed */
-            assert(0);
-            goto loser;
-        } else if(size == avail) {
-            /* Our buffer was filled up, so it may have been too small.
-             * Allocate a new, larger buffer and try again. */
-            avail += INCREMENT;
-            free(buf);
-            buf = NULL;
-        } else {
-            /* success */
-            assert( size < avail );
-            assert( size > 0 );
-            break;
-        }
-    } while(1);
-
-    /* find last backslash */
-    for( i = size-1; i>=0 && buf[i] != '\\'; --i );
-    if( i < 0 ) {
-        assert(0);
-        goto loser;
-    }
-    assert( i < size-1 ); /* last character shouldn't be backslash */
-
-    /* get rid of everything after the last backslash */
-    buf[i+1] = '\0';
-
-    return buf;
-
-loser:
-    free(buf);
-    return NULL;
+/*
+ * Returns the full pathname of the directory containing this DLL, including
+ * the trailing slash or backslash.
+ * It is the caller's responsibility to free() the buffer that is returned.
+ */
+#ifdef WIN32
+static char*
+getDLLDirectory()
+{
+    char *buf=NULL;
+    const DWORD INCREMENT = 5;
+    DWORD avail = INCREMENT;
+    DWORD size, i;
+
+    do {
+        buf = (char*)malloc(avail+1); /* +1 for terminating NULL */
+        if( buf == NULL ) {
+            goto loser;
+        }
+        size = GetModuleFileName(NULL, buf, avail);
+        if( size == 0 ) {
+            /* function failed */
+            assert(0);
+            goto loser;
+        } else if(size == avail) {
+            /* Our buffer was filled up, so it may have been too small.
+             * Allocate a new, larger buffer and try again. */
+            avail += INCREMENT;
+            free(buf);
+            buf = NULL;
+        } else {
+            /* success */
+            assert( size < avail );
+            assert( size > 0 );
+            break;
+        }
+    } while(1);
+
+    /* find last backslash */
+    for( i = size-1; i>=0 && buf[i] != '\\'; --i );
+    if( i < 0 ) {
+        assert(0);
+        goto loser;
+    }
+    assert( i < size-1 ); /* last character shouldn't be backslash */
+
+    /* get rid of everything after the last backslash */
+    buf[i+1] = '\0';
+
+    return buf;
+
+loser:
+    free(buf);
+    return NULL;
 }
-#endif
+#endif
 
 /******************************************************************************
 ** Function: util_ReadPreferences
@@ -356,56 +356,56 @@
     return rv;
 }
 #else
-
-/* 0 == success, 1 == failure */
-static CK_RV
+
+/* 0 == success, 1 == failure */
+static CK_RV
 tryReadPrefs(const char*dir)
-{
-    FILE *fp;
-    char buf[1024];
-    char *path = NULL;
-    const char *rcfilename = "pkcs11rc";
-    CK_RV rv = CKR_FUNCTION_FAILED;
-
-    path = (char*) malloc(strlen(dir) + strlen(rcfilename) + 1);
-    if( path != NULL ) {
-        sprintf(path, "%s%s", dir, rcfilename);
-        fp = fopen(path, "rb");
-        if (fp) {
-            while (fgets(buf, sizeof(buf), fp)) {
-                util_ParsePreference(buf, sizeof(buf));
-            }
-            fclose(fp);
-            rv = CKR_OK;
-        }
-    }
- 
-    if(path) {
-        free(path);
-    }
-    return rv;
-}
+{
+    FILE *fp;
+    char buf[1024];
+    char *path = NULL;
+    const char *rcfilename = "pkcs11rc";
+    CK_RV rv = CKR_FUNCTION_FAILED;
 
-CK_RV util_ReadPreferences()
-{
-    CK_RV rv = CKR_FUNCTION_FAILED;
-    const char *hardcodedDir = "C:\\Program Files\\Muscle\\";
-    char *relDir = NULL;
-
-    relDir = getDLLDirectory();
-    if( relDir != NULL ) {
-        rv = tryReadPrefs(relDir);
-    }
-    if( rv != CKR_OK ) {
-        rv = tryReadPrefs(hardcodedDir);
-     }
- 
-    if( relDir ) {
-        free(relDir);
-    }
-     return rv;
-    
- }
+    path = (char*) malloc(strlen(dir) + strlen(rcfilename) + 1);
+    if( path != NULL ) {
+        sprintf(path, "%s%s", dir, rcfilename);
+        fp = fopen(path, "rb");
+        if (fp) {
+            while (fgets(buf, sizeof(buf), fp)) {
+                util_ParsePreference(buf, sizeof(buf));
+            }
+            fclose(fp);
+            rv = CKR_OK;
+        }
+    }
+ 
+    if(path) {
+        free(path);
+    }
+    return rv;
+}
+
+CK_RV util_ReadPreferences()
+{
+    CK_RV rv = CKR_FUNCTION_FAILED;
+    const char *hardcodedDir = "C:\\Program Files\\Muscle\\";
+    char *relDir = NULL;
+
+    relDir = getDLLDirectory();
+    if( relDir != NULL ) {
+        rv = tryReadPrefs(relDir);
+    }
+    if( rv != CKR_OK ) {
+        rv = tryReadPrefs(hardcodedDir);
+     }
+ 
+    if( relDir ) {
+        free(relDir);
+    }
+     return rv;
+    
+ }
 
 #endif