r23726: Explicitly pass down the FLAGS2 field to srvstr_pull_buf. The next

[tprouty/samba.git] / source / smbd / dfree.c

diff --git a/source/smbd/dfree.c b/source/smbd/dfree.c
index 7848309a5ea190813b8ce0ff7b2f2bb49ca588b6..c488add227a80debfeddadf043c7f4eccbd6ea4c 100644 (file)
--- a/source/smbd/dfree.c
+++ b/source/smbd/dfree.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    functions to calculate the free disk space
    Copyright (C) Andrew Tridgell 1998
    
@@ -21,12 +20,10 @@
 
 #include "includes.h"
 
-
-extern int DEBUGLEVEL;
-
 /****************************************************************************
-normalise for DOS usage 
+ Normalise for DOS usage.
 ****************************************************************************/
+
 static void disk_norm(BOOL small_query, SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize)
 {
        /* check if the disk is beyond the max disk size */
@@ -40,11 +37,11 @@ static void disk_norm(BOOL small_query, SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,
                   errors */
        }  
 
-       while (*dfree > WORDMAX || *dsize > WORDMAX || *bsize < 512) {
-               *dfree /= 2;
-               *dsize /= 2;
-               *bsize *= 2;
-               if(small_query) {       
+       if(small_query) {       
+               while (*dfree > WORDMAX || *dsize > WORDMAX || *bsize < 512) {
+                       *dfree /= 2;
+                       *dsize /= 2;
+                       *bsize *= 2;
                        /*
                         * Force max to fit in 16 bit fields.
                         */
@@ -63,17 +60,17 @@ static void disk_norm(BOOL small_query, SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,
 
 
 /****************************************************************************
-  return number of 1K blocks available on a path and total number 
+ Return number of 1K blocks available on a path and total number.
 ****************************************************************************/
 
-static SMB_BIG_UINT disk_free(const char *path, BOOL small_query, 
+SMB_BIG_UINT sys_disk_free(connection_struct *conn, const char *path, BOOL small_query, 
                               SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize)
 {
-       int dfree_retval;
+       SMB_BIG_UINT dfree_retval;
        SMB_BIG_UINT dfree_q = 0;
        SMB_BIG_UINT bsize_q = 0;
        SMB_BIG_UINT dsize_q = 0;
-       char *dfree_command;
+       const char *dfree_command;
 
        (*dfree) = (*dsize) = 0;
        (*bsize) = 512;
@@ -82,9 +79,9 @@ static SMB_BIG_UINT disk_free(const char *path, BOOL small_query,
         * If external disk calculation specified, use it.
         */
 
-       dfree_command = lp_dfree_command();
+       dfree_command = lp_dfree_command(SNUM(conn));
        if (dfree_command && *dfree_command) {
-               char *p;
+               const char *p;
                char **lines;
                pstring syscmd;
 
@@ -97,15 +94,15 @@ static SMB_BIG_UINT disk_free(const char *path, BOOL small_query,
 
                        DEBUG (3, ("Read input from dfree, \"%s\"\n", line));
 
-                       *dsize = (SMB_BIG_UINT)strtoul(line, &p, 10);
-                       while (p && *p & isspace(*p))
+                       *dsize = STR_TO_SMB_BIG_UINT(line, &p);
+                       while (p && *p && isspace(*p))
                                p++;
                        if (p && *p)
-                               *dfree = (SMB_BIG_UINT)strtoul(p, &p, 10);
-                       while (p && *p & isspace(*p))
+                               *dfree = STR_TO_SMB_BIG_UINT(p, &p);
+                       while (p && *p && isspace(*p))
                                p++;
                        if (p && *p)
-                               *bsize = (SMB_BIG_UINT)strtoul(p, NULL, 10);
+                               *bsize = STR_TO_SMB_BIG_UINT(p, NULL);
                        else
                                *bsize = 1024;
                        file_lines_free(lines);
@@ -119,10 +116,19 @@ static SMB_BIG_UINT disk_free(const char *path, BOOL small_query,
                } else {
                        DEBUG (0, ("disk_free: sys_popen() failed for command %s. Error was : %s\n",
                                syscmd, strerror(errno) ));
-                       sys_fsusage(path, dfree, dsize);
+                       if (sys_fsusage(path, dfree, dsize) != 0) {
+                               DEBUG (0, ("disk_free: sys_fsusage() failed. Error was : %s\n",
+                                       strerror(errno) ));
+                               return (SMB_BIG_UINT)-1;
+                       }
+               }
+       } else {
+               if (sys_fsusage(path, dfree, dsize) != 0) {
+                       DEBUG (0, ("disk_free: sys_fsusage() failed. Error was : %s\n",
+                               strerror(errno) ));
+                       return (SMB_BIG_UINT)-1;
                }
-       } else
-               sys_fsusage(path, dfree, dsize);
+       }
 
        if (disk_quotas(path, &bsize_q, &dfree_q, &dsize_q)) {
                (*bsize) = bsize_q;
@@ -157,12 +163,54 @@ static SMB_BIG_UINT disk_free(const char *path, BOOL small_query,
        return(dfree_retval);
 }
 
-
 /****************************************************************************
-wrap it to get filenames right
+ Potentially returned cached dfree info.
 ****************************************************************************/
-SMB_BIG_UINT sys_disk_free(const char *path, BOOL small_query, 
-                           SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize)
+
+SMB_BIG_UINT get_dfree_info(connection_struct *conn,
+                       const char *path,
+                       BOOL small_query,
+                       SMB_BIG_UINT *bsize,
+                       SMB_BIG_UINT *dfree,
+                       SMB_BIG_UINT *dsize)
 {
-       return disk_free(path,small_query, bsize,dfree,dsize);
+       int dfree_cache_time = lp_dfree_cache_time(SNUM(conn));
+       struct dfree_cached_info *dfc = conn->dfree_info;
+       SMB_BIG_UINT dfree_ret;
+
+       if (!dfree_cache_time) {
+               return SMB_VFS_DISK_FREE(conn,path,small_query,bsize,dfree,dsize);
+       }
+
+       if (dfc && (conn->lastused - dfc->last_dfree_time < dfree_cache_time)) {
+               /* Return cached info. */
+               *bsize = dfc->bsize;
+               *dfree = dfc->dfree;
+               *dsize = dfc->dsize;
+               return dfc->dfree_ret;
+       }
+
+       dfree_ret = SMB_VFS_DISK_FREE(conn,path,small_query,bsize,dfree,dsize);
+
+       if (dfree_ret == (SMB_BIG_UINT)-1) {
+               /* Don't cache bad data. */
+               return dfree_ret;
+       }
+
+       /* No cached info or time to refresh. */
+       if (!dfc) {
+               dfc = TALLOC_P(conn->mem_ctx, struct dfree_cached_info);
+               if (!dfc) {
+                       return dfree_ret;
+               }
+               conn->dfree_info = dfc;
+       }
+
+       dfc->bsize = *bsize;
+       dfc->dfree = *dfree;
+       dfc->dsize = *dsize;
+       dfc->dfree_ret = dfree_ret;
+       dfc->last_dfree_time = conn->lastused;
+
+       return dfree_ret;
 }