Displaying 10 results from an estimated 10 matches for "str_blkid".
2015 Jan 14
2
[PATCH] daemon: use btrfs(1) to get btrfs labels
...| 3 +++
3 files changed, 33 insertions(+)
diff --git a/daemon/blkid.c b/daemon/blkid.c
index b98c155..2c9e2f1 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -26,6 +26,7 @@
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
GUESTFSD_EXT_CMD(str_blkid, blkid);
@@ -76,6 +77,11 @@ do_vfs_type (const mountable_t *mountable)
char *
do_vfs_label (const mountable_t *mountable)
{
+ CLEANUP_FREE char *type = do_vfs_type (mountable);
+
+ if (type && STREQ (type, "btrfs") && optgroup_btrfs_available ())
+ return btrfs_g...
2015 Jan 15
0
[PATCH 1/2] daemon: use btrfs(1) to get btrfs labels
...| 3 +++
3 files changed, 35 insertions(+)
diff --git a/daemon/blkid.c b/daemon/blkid.c
index b98c155..e8e7b58 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -26,6 +26,7 @@
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
GUESTFSD_EXT_CMD(str_blkid, blkid);
@@ -76,6 +77,13 @@ do_vfs_type (const mountable_t *mountable)
char *
do_vfs_label (const mountable_t *mountable)
{
+ CLEANUP_FREE char *type = do_vfs_type (mountable);
+
+ if (type) {
+ if (STREQ (type, "btrfs") && optgroup_btrfs_available ())
+ return btrf...
2012 Aug 30
2
[PATCH v2] daemon: collect list of called external commands
...f --git a/contrib/intro/libguestfs-intro.html b/contrib/intro/libguestfs-intro.html
index 380e290..52dcce5 100644
--- a/contrib/intro/libguestfs-intro.html
+++ b/contrib/intro/libguestfs-intro.html
@@ -119,6 +119,7 @@ char *
return get_blkid_tag (device, "TYPE");
}
+GUESTFSD_EXT_CMD(str_blkid, blkid);
static char *
get_blkid_tag (const char *device, const char *tag)
{
@@ -126,7 +127,7 @@ get_blkid_tag (const char *device, const char *tag)
int r;
r = commandr (&out, &err,
- "blkid",
+ str_blkid,
"-c&...
2012 Aug 30
1
[PATCH] collect list of called external commands
...ff --git a/contrib/intro/libguestfs-intro.html b/contrib/intro/libguestfs-intro.html
index 380e290..a413207 100644
--- a/contrib/intro/libguestfs-intro.html
+++ b/contrib/intro/libguestfs-intro.html
@@ -119,6 +119,7 @@ char *
return get_blkid_tag (device, "TYPE");
}
+GUESTFS_EXT_CMD(str_blkid, blkid);
static char *
get_blkid_tag (const char *device, const char *tag)
{
@@ -126,7 +127,7 @@ get_blkid_tag (const char *device, const char *tag)
int r;
r = commandr (&out, &err,
- "blkid",
+ str_blkid,
"-c&...
2017 Jul 27
0
[PATCH v2] daemon: Remove GUESTFSD_EXT_CMD.
...-1) {
reply_with_perror ("asprintf");
return -1;
}
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 1fe5ff93a..d9858d5c8 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -28,8 +28,6 @@
#include "actions.h"
#include "optgroups.h"
-GUESTFSD_EXT_CMD(str_blkid, blkid);
-
char *
get_blkid_tag (const char *device, const char *tag)
{
@@ -39,7 +37,7 @@ get_blkid_tag (const char *device, const char *tag)
size_t len;
r = commandr (&out, &err,
- str_blkid,
+ "blkid",
/* Adding -c option...
2017 Jul 24
0
[PATCH 2/2] daemon: Replace GUESTFSD_EXT_CMD with --print-external-commands.
...-1) {
reply_with_perror ("asprintf");
return -1;
}
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 1fe5ff93a..8de025495 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -28,7 +28,7 @@
#include "actions.h"
#include "optgroups.h"
-GUESTFSD_EXT_CMD(str_blkid, blkid);
+DECLARE_EXTERNAL_COMMANDS ("blkid")
char *
get_blkid_tag (const char *device, const char *tag)
@@ -39,7 +39,7 @@ get_blkid_tag (const char *device, const char *tag)
size_t len;
r = commandr (&out, &err,
- str_blkid,
+ "blkid...
2016 Jul 07
0
[PATCH 2/2] daemon: fix cleanup of stringsbuf usages
...mon/blkid.c
@@ -138,19 +138,19 @@ blkid_with_p_i_opt (const char *device)
int r;
CLEANUP_FREE char *out = NULL, *err = NULL;
CLEANUP_FREE_STRING_LIST char **lines = NULL;
- DECLARE_STRINGSBUF (ret);
+ CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret);
r = command (&out, &err, str_blkid, "-c", "/dev/null",
"-p", "-i", "-o", "export", device, NULL);
if (r == -1) {
reply_with_error ("%s", err);
- goto error;
+ return NULL;
}
/* Split the command output into lines */
lines =...
2016 Jul 07
2
[PATCH 1/2] daemon: free the string on stringsbuf add failure
If add_string_nodup fails free the passed string instead of leaking it,
as that string would have been owned by the stringbuf.
Adapt few places to this behaviour.
---
daemon/btrfs.c | 4 +---
daemon/devsparts.c | 8 ++++----
daemon/guestfsd.c | 1 +
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 9b52aa8..d70565a 100644
---
2017 Jul 27
3
[PATCH v2] daemon: Remove GUESTFSD_EXT_CMD.
This is a simpler patch that removes GUESTFSD_EXT_CMD completely.
2017 Jul 24
6
[PATCH 0/2] daemon: Replace GUESTFSD_EXT_CMD with --print-external-commands.
Replace GUESTFSD_EXT_CMD with a command line option
‘./guestfsd --print-external-commands’