From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 26 Sep 2006 03:23:46 +0000 (+0000)
Subject: STABLE14-getcellunix-use-stdio-again-20060925
X-Git-Tag: openafs-stable-1_4_2~37
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f566dca39c3135d3222d27b3e60bbd8e7492b980;p=packages%2Fo%2Fopenafs.git

STABLE14-getcellunix-use-stdio-again-20060925


i have no idea why this is so ugly. put it back to something like how it was.


(cherry picked from commit 2201fd6d9ff41506c1bc60d677ae268a1de42fbc)
---

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 70b929dd3..8bea91819 100644
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -478,28 +478,22 @@ GetCellUnix(struct afsconf_dir *adir)
 {
     int rc;
     char tbuffer[256];
-    int fd;
+    char *p;
+    afsconf_FILE *fp;
     
     strcompose(tbuffer, 256, adir->name, "/", AFSDIR_THISCELL_FILE, NULL);
-    fd = open(tbuffer, O_RDONLY, 0);
-    if (fd < 0) {
-        return -1;
-    } else {
-	int sz;
-
-	memset(tbuffer, 0, 256);
-        sz = read(fd, tbuffer, 255);
-        close(fd);
-        if (sz > 0) {
-	    char *p = strchr(tbuffer, '\n');
-	    if (p)
-		*p = '\0';
-
-            adir->cellName = (char *)malloc(sz + 1);
-            memset(adir->cellName, 0, sz+1);
-	    strncpy(adir->cellName, tbuffer, sz);
-        }
+    fp = fopen(tbuffer, "r");
+    if (fp == 0) {
+	return -1;
     }
+    rc = fgets(tbuffer, 256, fp);
+    fclose(fp);
+
+    p = strchr(tbuffer, '\n');
+    if (p)
+	*p = '\0';
+
+    adir->cellName = strdup(tbuffer);
     return 0;
 }