From 78f8c70e3799aad37359ca6b399195e95a94d07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust@mageia.org>
Date: Sun, 11 Nov 2012 11:44:08 +0000
Subject: Revert commit 6430

---
 mdk-stage1/utils.c | 134 ++++++++++++++++++++++++++---------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

(limited to 'mdk-stage1/utils.c')

diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c
index dc71b6a43..af5ee9af3 100644
--- a/mdk-stage1/utils.c
+++ b/mdk-stage1/utils.c
@@ -31,73 +31,73 @@
 // - it stops on first non-digit char
 int charstar_to_int(const char * s)
 {
-    int number = 0;
-    while (*s && isdigit(*s)) {
-        number = (number * 10) + (*s - '0');
-        s++;
-    }
-    return number;
+	int number = 0;
+	while (*s && isdigit(*s)) {
+		number = (number * 10) + (*s - '0');
+		s++;
+	}
+	return number;
 }
 
 off_t file_size(const char * path)
 {
-    struct stat statr;
-    if (stat(path, &statr))
-        return -1;
+	struct stat statr;
+	if (stat(path, &statr))
+		return -1;
         else
                 return statr.st_size;
 }
 
 char * cat_file(const char * file, struct stat * s) {
-    char * buf;
-    int fd = open(file, O_RDONLY);
-    if (fd == -1) {
-        log_perror(file);
-        return NULL;
-    }
-    
-    fstat(fd, s);
-    buf = malloc(s->st_size + 1);
-    if (read(fd, buf, s->st_size) != (ssize_t)s->st_size) {
-        close(fd);
-        free(buf);
-        log_perror(file);
-        return NULL;
-    }
-    buf[s->st_size] = '\0';
-    close(fd);
-
-    return buf;
+	char * buf;
+	int fd = open(file, O_RDONLY);
+	if (fd == -1) {
+		log_perror(file);
+		return NULL;
+	}
+	
+	fstat(fd, s);
+	buf = malloc(s->st_size + 1);
+	if (read(fd, buf, s->st_size) != (ssize_t)s->st_size) {
+		close(fd);
+		free(buf);
+		log_perror(file);
+		return NULL;
+	}
+	buf[s->st_size] = '\0';
+	close(fd);
+
+	return buf;
 }
 
 int line_counts(const char * buf) {
-    const char * ptr = buf;
-    int line = 0;
-    while (ptr) {
-        line++;
-        ptr = strchr(ptr + 1, '\n');
-    }
-    return line;
+	const char * ptr = buf;
+	int line = 0;
+	while (ptr) {
+		line++;
+		ptr = strchr(ptr + 1, '\n');
+	}
+	return line;
 }
 
 int total_memory(void)
 {
-    int value;
+	int value;
 
-    /* drakx powered: use /proc/kcore and rounds every 4 Mbytes */
-    value = 4 * ((int)((float)file_size("/proc/kcore") / 1024 / 1024 / 4 + 0.5));
-    log_message("Total Memory: %d Mbytes", value);
+	/* drakx powered: use /proc/kcore and rounds every 4 Mbytes */
+	value = 4 * ((int)((float)file_size("/proc/kcore") / 1024 / 1024 / 4 + 0.5));
+	log_message("Total Memory: %d Mbytes", value);
 
-    return value;
+	return value;
 }
 
 /* pixel's */
 void * _memdup(void *src, size_t size)
 {
-    void * r;
-    r = malloc(size);
-    memcpy(r, src, size);
-    return r;
+	void * r;
+	r = malloc(size);
+	memcpy(r, src, size);
+	return r;
 }
 
 
@@ -115,33 +115,33 @@ void add_to_env(char * name, char * value)
 
 char ** list_directory(char * direct)
 {
-    char * tmp[50000]; /* in /dev there can be many many files.. */
-    int i = 0;
-    struct dirent *ep;
-    DIR *dp = opendir(direct);
-    while (dp && (ep = readdir(dp))) {
-        if (strcmp(ep->d_name, ".") && strcmp(ep->d_name, "..")) {
-            tmp[i] = strdup(ep->d_name);
-            i++;
-        }
-    }
-    if (dp)
-        closedir(dp);
-    tmp[i] = NULL;
-    return _memdup(tmp, sizeof(char*) * (i+1));
+	char * tmp[50000]; /* in /dev there can be many many files.. */
+	int i = 0;
+	struct dirent *ep;
+	DIR *dp = opendir(direct);
+	while (dp && (ep = readdir(dp))) {
+		if (strcmp(ep->d_name, ".") && strcmp(ep->d_name, "..")) {
+			tmp[i] = strdup(ep->d_name);
+			i++;
+		}
+	}
+	if (dp)
+		closedir(dp);
+	tmp[i] = NULL;
+	return _memdup(tmp, sizeof(char*) * (i+1));
 }
 
 
 int string_array_length(char ** a)
 {
-    int i = 0;
-    if (!a)
-        return -1;
-    while (a && *a) {
-        a++;
-        i++;
-    }
-    return i;
+	int i = 0;
+	if (!a)
+		return -1;
+	while (a && *a) {
+		a++;
+		i++;
+	}
+	return i;
 }
 
 char * asprintf_(const char *msg, ...)
@@ -164,7 +164,7 @@ char * asprintf_(const char *msg, ...)
 
 int scall_(int retval, char * msg, char * file, int line)
 {
-    char tmp[5000];
+	char tmp[5000];
         sprintf(tmp, "%s(%s:%d) failed", msg, file, line);
         if (retval)
                 log_perror(tmp);
-- 
cgit v1.2.1