From 9a92446bcad09b492dee42dd5950bac67073fbea Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jun 2009 12:46:59 +0100 Subject: [PATCH] Added 'du' command. This command estimates file usage for files and directories. --- TODO | 1 - daemon/Makefile.am | 1 + daemon/du.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/generator.ml | 16 ++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 daemon/du.c diff --git a/TODO b/TODO index 2109e1d..48628f5 100644 --- a/TODO +++ b/TODO @@ -120,7 +120,6 @@ Extra commands / functionality: chgrp grep (do it locally using pipe?) dd (?) - du ln / ln -s mknod readlink diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e33a7f7..2884e93 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -33,6 +33,7 @@ guestfsd_SOURCES = \ dir.c \ dmesg.c \ dropcaches.c \ + du.c \ ext2.c \ file.c \ find.c \ diff --git a/daemon/du.c b/daemon/du.c new file mode 100644 index 0000000..6287a20 --- /dev/null +++ b/daemon/du.c @@ -0,0 +1,72 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2009 Red Hat Inc. + * + * 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) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +#include +#include +#include +#include +#include + +#include "../src/guestfs_protocol.h" +#include "daemon.h" +#include "actions.h" + +int64_t +do_du (char *path) +{ + int r; + int64_t rv; + char *out, *err; + char *buf; + int len; + + NEED_ROOT (-1); + ABS_PATH (path, -1); + + /* Make the path relative to /sysroot. */ + len = strlen (path) + 9; + buf = malloc (len); + if (!buf) { + reply_with_perror ("malloc"); + return -1; + } + snprintf (buf, len, "/sysroot%s", path); + + r = command (&out, &err, "du", "-s", buf, NULL); + free (buf); + if (r == -1) { + reply_with_error ("du: %s: %s", path, err); + free (out); + free (err); + return -1; + } + + free (err); + + if (sscanf (out, "%"SCNi64, &rv) != 1) { + reply_with_error ("du: %s: could not read output: %s", path, out); + free (out); + return -1; + } + + free (out); + + return rv; +} diff --git a/src/generator.ml b/src/generator.ml index 85e5c02..5885ff3 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2583,6 +2583,22 @@ This command is mostly useful for interactive sessions. It is I intended that you try to parse the output string. Use C from programs."); + ("du", (RInt64 "sizekb", [String "path"]), 127, [], + [InitBasicFS, Always, TestOutputInt ( + [["mkdir"; "/p"]; + ["du"; "/p"]], 1 (* ie. 1 block, so depends on ext3 blocksize *))], + "estimate file space usage", + "\ +This command runs the C command to estimate file space +usage for C. + +C can be a file or a directory. If C is a directory +then the estimate includes the contents of the directory and all +subdirectories (recursively). + +The result is the estimated size in I +(ie. units of 1024 bytes)."); + ] let all_functions = non_daemon_functions @ daemon_functions -- 1.8.3.1