projects
/
project
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libfstools: be more consistent with other existing code
[project/fstools.git]
/
libfstools
/
ubi.c
diff --git
a/libfstools/ubi.c
b/libfstools/ubi.c
index 42f76ca7a29a794cc9a2d968095f41c6b3e0f74b..866034a7cc84e4d06e495b18d87be85ec658ca8a 100644
(file)
--- a/
libfstools/ubi.c
+++ b/
libfstools/ubi.c
@@
-19,22
+19,25
@@
#include "libfstools.h"
#include "volume.h"
#include "libfstools.h"
#include "volume.h"
+/* fit for UBI_MAX_VOLUME_NAME and sysfs path lengths */
+#define BUFLEN 128
+
/* could use libubi-tiny instead, but already had the code directly reading
* from sysfs */
/* could use libubi-tiny instead, but already had the code directly reading
* from sysfs */
-c
har *
ubi_dir_name = "/sys/devices/virtual/ubi";
+c
onst char *const
ubi_dir_name = "/sys/devices/virtual/ubi";
struct ubi_priv {
int ubi_num;
struct ubi_priv {
int ubi_num;
- int ubi_volid
x
;
+ int ubi_volid;
};
static struct driver ubi_driver;
};
static struct driver ubi_driver;
-static
unsigned
int
+static int
read_uint_from_file(char *dirname, char *filename, unsigned int *i)
{
FILE *f;
read_uint_from_file(char *dirname, char *filename, unsigned int *i)
{
FILE *f;
- char fname[
128
];
+ char fname[
BUFLEN
];
int ret = -1;
snprintf(fname, sizeof(fname), "%s/%s", dirname, filename);
int ret = -1;
snprintf(fname, sizeof(fname), "%s/%s", dirname, filename);
@@
-54,10
+57,9
@@
static char
*read_string_from_file(char *dirname, char *filename)
{
FILE *f;
*read_string_from_file(char *dirname, char *filename)
{
FILE *f;
- char fname[
128
];
- char buf[
128
];
+ char fname[
BUFLEN
];
+ char buf[
BUFLEN
];
int i;
int i;
- char *str;
snprintf(fname, sizeof(fname), "%s/%s", dirname, filename);
snprintf(fname, sizeof(fname), "%s/%s", dirname, filename);
@@
-65,17
+67,20
@@
static char
if (!f)
return NULL;
if (!f)
return NULL;
- if (fgets(buf,
128
, f) == NULL)
+ if (fgets(buf,
sizeof(buf)
, f) == NULL)
return NULL;
return NULL;
- i = strlen(buf);
- do
- buf[i--]='\0';
- while (buf[i] == '\n');
-
- str = strdup(buf);
fclose(f);
fclose(f);
- return str;
+
+ /* make sure the string is \0 terminated */
+ buf[sizeof(buf) - 1] = '\0';
+
+ /* remove trailing whitespace */
+ i = strlen(buf) - 1;
+ while (i > 0 && buf[i] <= ' ')
+ buf[i--] = '\0';
+
+ return strdup(buf);
}
static unsigned int
}
static unsigned int
@@
-93,17
+98,17
@@
test_open(char *filename)
static int ubi_volume_init(struct volume *v)
{
static int ubi_volume_init(struct volume *v)
{
- char voldir[
40], voldev[32
], *volname;
+ char voldir[
BUFLEN], voldev[BUFLEN
], *volname;
struct ubi_priv *p;
unsigned int volsize;
p = (struct ubi_priv*)v->priv;
snprintf(voldir, sizeof(voldir), "%s/ubi%u/ubi%u_%u",
struct ubi_priv *p;
unsigned int volsize;
p = (struct ubi_priv*)v->priv;
snprintf(voldir, sizeof(voldir), "%s/ubi%u/ubi%u_%u",
- ubi_dir_name, p->ubi_num, p->ubi_num, p->ubi_volid
x
);
+ ubi_dir_name, p->ubi_num, p->ubi_num, p->ubi_volid);
snprintf(voldev, sizeof(voldev), "/dev/ubi%u_%u",
snprintf(voldev, sizeof(voldev), "/dev/ubi%u_%u",
- p->ubi_num, p->ubi_volid
x
);
+ p->ubi_num, p->ubi_volid);
volname = read_string_from_file(voldir, "name");
if (!volname)
volname = read_string_from_file(voldir, "name");
if (!volname)
@@
-120,25
+125,26
@@
static int ubi_volume_init(struct volume *v)
return 0;
}
return 0;
}
-
-static int ubi_volume_match(struct volume *v, char *name, int ubi_num, int volidx)
+static int ubi_volume_match(struct volume *v, char *name, int ubi_num, int volid)
{
{
- char voldir[
40], volblkdev[40
], *volname;
+ char voldir[
BUFLEN], volblkdev[BUFLEN
], *volname;
struct ubi_priv *p;
snprintf(voldir, sizeof(voldir), "%s/ubi%u/ubi%u_%u",
struct ubi_priv *p;
snprintf(voldir, sizeof(voldir), "%s/ubi%u/ubi%u_%u",
- ubi_dir_name, ubi_num, ubi_num, volid
x
);
+ ubi_dir_name, ubi_num, ubi_num, volid);
snprintf(volblkdev, sizeof(volblkdev), "/dev/ubiblock%u_%u",
snprintf(volblkdev, sizeof(volblkdev), "/dev/ubiblock%u_%u",
- ubi_num, volid
x
);
+ ubi_num, volid);
/* skip if ubiblock device exists */
if (test_open(volblkdev))
return -1;
/* skip if ubiblock device exists */
if (test_open(volblkdev))
return -1;
+ /* todo: skip existing gluebi device for legacy support */
+
volname = read_string_from_file(voldir, "name");
volname = read_string_from_file(voldir, "name");
- if (strncmp(name, volname, strlen(volname)))
+ if (strncmp(name, volname, strlen(volname)
+ 1
))
return -1;
p = calloc(1, sizeof(struct ubi_priv));
return -1;
p = calloc(1, sizeof(struct ubi_priv));
@@
-148,7
+154,7
@@
static int ubi_volume_match(struct volume *v, char *name, int ubi_num, int volid
v->priv = p;
v->drv = &ubi_driver;
p->ubi_num = ubi_num;
v->priv = p;
v->drv = &ubi_driver;
p->ubi_num = ubi_num;
- p->ubi_volid
x = volidx
;
+ p->ubi_volid
= volid
;
return ubi_volume_init(v);
}
return ubi_volume_init(v);
}
@@
-156,7
+162,7
@@
static int ubi_volume_match(struct volume *v, char *name, int ubi_num, int volid
static int ubi_part_match(struct volume *v, char *name, unsigned int ubi_num)
{
unsigned int i, volumes_count;
static int ubi_part_match(struct volume *v, char *name, unsigned int ubi_num)
{
unsigned int i, volumes_count;
- char devdir[
80
];
+ char devdir[
BUFLEN
];
snprintf(devdir, sizeof(devdir), "%s/ubi%u",
ubi_dir_name, ubi_num);
snprintf(devdir, sizeof(devdir), "%s/ubi%u",
ubi_dir_name, ubi_num);
@@
-205,6
+211,7
@@
static int ubi_volume_find(struct volume *v, char *name)
static int ubi_volume_identify(struct volume *v)
{
static int ubi_volume_identify(struct volume *v)
{
+ /* Todo: use libblkid-tiny on the ubi chardev */
return FS_UBIFS;
}
return FS_UBIFS;
}