[03/29] Add utility function to detect filesystem

Message ID	20211011112156.44192-4-sbabic@denx.de
State	Changes Requested
Headers	show Return-Path: <swupdate+bncBCXPLOXJ6IKRBZN4SCFQMGQEGSFQMVY@googlegroups.com> Sender: swupdate@googlegroups.com Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.10; From: Stefano Babic <sbabic@denx.de> To: swupdate@googlegroups.com Cc: Stefano Babic <sbabic@denx.de> Subject: [swupdate] [PATCH 03/29] Add utility function to detect filesystem Date: Mon, 11 Oct 2021 13:21:30 +0200 Message-Id: <20211011112156.44192-4-sbabic@denx.de> In-Reply-To: <20211011112156.44192-1-sbabic@denx.de> References: <20211011112156.44192-1-sbabic@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com
Series	DELTA Update \| expand [00/29] DELTA Update [01/29] Doc for delta update [02/29] Handlers: sort list of handlers in menuconfig [03/29] Add utility function to detect filesystem [04/29] util: add function to convert string to lowercase [05/29] Hide copyfile() implementation to add more input [06/29] Introduce copybuffer to copy from memory [07/29] Import small multipart library [08/29] Fix warning in multipart code [09/29] channel_curl: statify entry points functions [10/29] channel_curl: fix wrong usage of pointer in assert [11/29] channel_curl: do not automatically add charset header [12/29] curl: change signature of write data callback [13/29] curl: add a noipc parameter [14/29] channel_curl: pass channel_data to headers callback [15/29] channel_curl: allow an external callback for headers [16/29] channel_curl: add optional pointer for callbacks [17/29] channel_curl: pass channel pointer to internal callbacks [18/29] channel_curl: add the possibility to request a range [19/29] channel_curl: do not check download size if range requested [20/29] channel_curl: store HTTP return code before callbacks [21/29] Be sure to initialize channel_data_t by users [22/29] delta: add process to download chunks [23/29] tools: fix warning due to new SOURCE type [24/29] example: userid and groupid in case of downloader [25/29] Start chunks downloader if delta is enabled [26/29] delta: add handler for delta update [27/29] doc: add documentation for delta handler [28/29] doc: drop delta update from roadmap [29/29] delta: add the option to limit size for source

Message ID

20211011112156.44192-4-sbabic@denx.de

State

Changes Requested

Headers

Sender: swupdate@googlegroups.com
Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied
 by domain of sbabic@denx.de) client-ip=212.18.0.10;
From: Stefano Babic <sbabic@denx.de>
To: swupdate@googlegroups.com
Cc: Stefano Babic <sbabic@denx.de>
Subject: [swupdate] [PATCH 03/29] Add utility function to detect filesystem
Date: Mon, 11 Oct 2021 13:21:30 +0200
Message-Id: <20211011112156.44192-4-sbabic@denx.de>
In-Reply-To: <20211011112156.44192-1-sbabic@denx.de>
References: <20211011112156.44192-1-sbabic@denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list swupdate@googlegroups.com;
 contact swupdate+owners@googlegroups.com

Series

DELTA Update | expand

Commit Message

Stefano Babic Oct. 11, 2021, 11:21 a.m. UTC

This can be used to detect a filesystem from a device instead of specify
the expected filesystem.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 fs/diskformat.c        | 28 ++++++++++++++++++++--------
 include/fs_interface.h |  1 +
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/fs/diskformat.c b/fs/diskformat.c
index 0841f0b..8d58fc3 100644
--- a/fs/diskformat.c
+++ b/fs/diskformat.c
@@ -39,36 +39,48 @@  static struct supported_filesystems fs[] = {
  * Checks if file system fstype already exists on device.
  * return 0 if not exists, 1 if exists, negative values on failure
  */
-int diskformat_fs_exists(char *device, char *fstype)
+
+char *diskformat_fs_detect(char *device)
 {
-	char buf[10];
-	const char *value = buf;
+	const char *value;
+	char *s = NULL;
 	size_t len;
 	blkid_probe pr;
-	int ret = 0;
 
 	pr = blkid_new_probe_from_filename(device);
 
 	if (!pr) {
 		ERROR("%s: failed to create libblkid probe",
 			  device);
-		return -EFAULT;
+		return NULL;
 	}
 
 	while (blkid_do_probe(pr) == 0) {
 		if (blkid_probe_lookup_value(pr, "TYPE", &value, &len)) {
 			ERROR("blkid_probe_lookup_value failed");
-			ret = -EFAULT;
 			break;
 		}
 
-		if (!strncmp(value, fstype, sizeof(buf))) {
-			ret = 1;
+		if (len > 0) {
+			s = strndup(value, len);
 			break;
 		}
 	}
 	blkid_free_probe(pr);
 
+	return s;
+}
+
+int diskformat_fs_exists(char *device, char *fstype)
+{
+	int ret = 0;
+	char *filesystem = diskformat_fs_detect(device);
+
+	if (filesystem) {
+		ret = !strcmp(fstype, filesystem);
+	}
+
+	free(filesystem);
 	return ret;
 }
 
diff --git a/include/fs_interface.h b/include/fs_interface.h
index 25c22e5..581f02a 100644
--- a/include/fs_interface.h
+++ b/include/fs_interface.h
@@ -7,6 +7,7 @@ 
 #ifndef _FS_INTERFACE_H
 #define _FS_INTERFACE_H
 
+char *diskformat_fs_detect(char *device);
 int diskformat_fs_exists(char *device, char *fstype);
 
 int diskformat_mkfs(char *device, char *fstype);

[03/29] Add utility function to detect filesystem

Commit Message

Patch