r23796: main COPYING file for samba4, plus some formatting varients

[samba.git] / source4 / lib / util / util_file.c

diff --git a/source4/lib/util/util_file.c b/source4/lib/util/util_file.c
index 8d8e7c6ec9c3b2a2566fd9812b9b7fcf1518c8aa..df4cb902f0bf9b8c95d9de5cbe88e308ba1a2784 100644 (file)
--- a/source4/lib/util/util_file.c
+++ b/source4/lib/util/util_file.c
@@ -7,7 +7,7 @@
  * 
  * This program 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
  * 
  * This program 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; either version 2 of the License, or (at your option)
+ * Software Foundation; either version 3 of the License, or (at your option)

  * any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT


@@ -125,6 +125,10 @@ _PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint)
 
                ret = read(fd, data + offset, hint);
 
 
                ret = read(fd, data + offset, hint);
 

+               if (ret == 0) {
+                       return NULL;
+               }
+

                if (ret == -1) {
                        talloc_free(data);
                        return NULL;
                if (ret == -1) {
                        talloc_free(data);
                        return NULL;


@@ -237,6 +241,7 @@ _PUBLIC_ void *map_file(const char *fname, size_t size)
 
 /**
 parse a buffer into lines
 
 /**
 parse a buffer into lines

+'p' will be freed on error, and otherwise will be made a child of the returned array

 **/
 static char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx)
 {
 **/
 static char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx)
 {


@@ -255,10 +260,9 @@ static char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *
                return NULL;
        }       
        
                return NULL;
        }       
        

-       talloc_reference(ret, p);
+       talloc_steal(ret, p);

        
        memset(ret, 0, sizeof(ret[0])*(i+2));
        
        memset(ret, 0, sizeof(ret[0])*(i+2));

-       if (numlines) *numlines = i;

 
        ret[0] = p;
        for (s = p, i=0; s < p+size; s++) {
 
        ret[0] = p;
        for (s = p, i=0; s < p+size; s++) {


@@ -270,6 +274,13 @@ static char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *
                if (s[0] == '\r') s[0] = 0;
        }
 
                if (s[0] == '\r') s[0] = 0;
        }
 

+       /* remove any blank lines at the end */
+       while (i > 0 && ret[i-1][0] == 0) {
+               i--;
+       }
+
+       if (numlines) *numlines = i;
+

        return ret;
 }
 
        return ret;
 }
 


@@ -281,17 +292,12 @@ must be freed with talloc_free().
 _PUBLIC_ char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx)
 {
        char *p;
 _PUBLIC_ char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx)
 {
        char *p;

-       char **lines;

        size_t size;
 
        p = file_load(fname, &size, mem_ctx);
        if (!p) return NULL;
 
        size_t size;
 
        p = file_load(fname, &size, mem_ctx);
        if (!p) return NULL;
 

-       lines = file_lines_parse(p, size, numlines, mem_ctx);
-
-       talloc_free(p);
-
-       return lines;
+       return file_lines_parse(p, size, numlines, mem_ctx);

 }
 
 /**
 }
 
 /**


@@ -302,17 +308,12 @@ the list.
 _PUBLIC_ char **fd_lines_load(int fd, int *numlines, TALLOC_CTX *mem_ctx)
 {
        char *p;
 _PUBLIC_ char **fd_lines_load(int fd, int *numlines, TALLOC_CTX *mem_ctx)
 {
        char *p;

-       char **lines;

        size_t size;
 
        p = fd_load(fd, &size, mem_ctx);
        if (!p) return NULL;
 
        size_t size;
 
        p = fd_load(fd, &size, mem_ctx);
        if (!p) return NULL;
 

-       lines = file_lines_parse(p, size, numlines, mem_ctx);
-
-       talloc_free(p);
-
-       return lines;
+       return file_lines_parse(p, size, numlines, mem_ctx);

 }
 
 
 }
 
 


@@ -356,15 +357,6 @@ _PUBLIC_ BOOL file_save(const char *fname, const void *packet, size_t length)
        return True;
 }
 
        return True;
 }
 

-/**
-  see if a file exists
-*/
-_PUBLIC_ BOOL file_exists(const char *path)
-{
-       struct stat st;
-       return (stat(path, &st) == 0);
-}
-

 _PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) _PRINTF_ATTRIBUTE(2,0)
 {
        char *p;
 _PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) _PRINTF_ATTRIBUTE(2,0)
 {
        char *p;


@@ -372,8 +364,8 @@ _PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) _PRINTF_ATTRIBUTE
        va_list ap2;
 
        va_copy(ap2, ap);
        va_list ap2;
 
        va_copy(ap2, ap);

-

        len = vasprintf(&p, format, ap2);
        len = vasprintf(&p, format, ap2);

+       va_end(ap2);

        if (len <= 0) return len;
        ret = write(fd, p, len);
        SAFE_FREE(p);
        if (len <= 0) return len;
        ret = write(fd, p, len);
        SAFE_FREE(p);


@@ -390,3 +382,24 @@ _PUBLIC_ int fdprintf(int fd, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
        va_end(ap);
        return ret;
 }
        va_end(ap);
        return ret;
 }

+
+
+/*
+  try to determine if the filesystem supports large files
+*/
+_PUBLIC_ bool large_file_support(const char *path)
+{
+       int fd;
+       ssize_t ret;
+       char c;
+
+       fd = open(path, O_RDWR|O_CREAT, 0600);
+       unlink(path);
+       if (fd == -1) {
+               /* have to assume large files are OK */
+               return true;
+       }
+       ret = pread(fd, &c, 1, ((uint64_t)1)<<32);
+       close(fd);
+       return ret == 0;
+}