From 311282ba6686a9410c7b3123b95b2281c0042f37 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 20 Mar 2018 21:58:17 +0100 Subject: rename file_operations -> cdev_operations Linux also has struct file_operations which are something different. Rename our file_operations to cdev_operations which better matches what we have. Signed-off-by: Sascha Hauer --- commands/mem.c | 2 +- commands/stddev.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'commands') diff --git a/commands/mem.c b/commands/mem.c index 29eaa80b23..eb91ade05a 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -81,7 +81,7 @@ int mem_parse_options(int argc, char *argv[], char *optstr, int *mode, return 0; } -static struct file_operations memops = { +static struct cdev_operations memops = { .read = mem_read, .write = mem_write, .memmap = generic_memmap_rw, diff --git a/commands/stddev.c b/commands/stddev.c index 93da2c7398..4d1b6f5108 100644 --- a/commands/stddev.c +++ b/commands/stddev.c @@ -25,7 +25,7 @@ static ssize_t zero_read(struct cdev *cdev, void *buf, size_t count, loff_t offs return count; } -static struct file_operations zeroops = { +static struct cdev_operations zeroops = { .read = zero_read, .lseek = dev_lseek_default, }; @@ -53,7 +53,7 @@ static ssize_t full_read(struct cdev *cdev, void *buf, size_t count, loff_t offs return count; } -static struct file_operations fullops = { +static struct cdev_operations fullops = { .read = full_read, .lseek = dev_lseek_default, }; @@ -80,7 +80,7 @@ static ssize_t null_write(struct cdev *cdev, const void *buf, size_t count, loff return count; } -static struct file_operations nullops = { +static struct cdev_operations nullops = { .write = null_write, .lseek = dev_lseek_default, }; @@ -108,7 +108,7 @@ static ssize_t prng_read(struct cdev *cdev, void *buf, size_t count, loff_t offs return count; } -static struct file_operations prngops = { +static struct cdev_operations prngops = { .read = prng_read, .lseek = dev_lseek_default, }; -- cgit v1.2.3 From 70d65438e5fdc8ff7505175299e2d63c0b56db03 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 29 Mar 2018 13:59:57 +0200 Subject: ls: Do not depend on normalise_path() When we want to show a directory we want to show the path ls is passed, not the normalised one. Signed-off-by: Sascha Hauer --- commands/ls.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'commands') diff --git a/commands/ls.c b/commands/ls.c index 771477b6e0..e54991862d 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -115,11 +115,8 @@ int ls(const char *path, ulong flags) continue; } - if (s.st_mode & S_IFDIR) { - char *norm = normalise_path(tmp); - ls(norm, flags); - free(norm); - } + if (s.st_mode & S_IFDIR) + ls(tmp, flags); } out: @@ -158,7 +155,7 @@ static int do_ls(int argc, char *argv[]) flags |= LS_SHOWARG; if (optind == argc) { - ret = ls(getcwd(), flags); + ret = ls(".", flags); return ret ? 1 : 0; } -- cgit v1.2.3 From 46e7bfbac6fa7d674e0536e012a2cb6af16abd34 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 29 Mar 2018 13:50:57 +0200 Subject: loadenv: Do not depend on normalise_path() normalise_path() will go away, so do without it. Signed-off-by: Sascha Hauer --- commands/loadenv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'commands') diff --git a/commands/loadenv.c b/commands/loadenv.c index 44e96c3b60..6469affadb 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -62,20 +62,16 @@ static int do_loadenv(int argc, char *argv[]) if (argc - optind < 1) { filename = default_environment_path_get(); } else { - char *str = normalise_path(argv[optind]); - /* * /dev/defaultenv use to contain the defaultenvironment. * we do not have this file anymore, but maintain compatibility * to the 'loadenv -s /dev/defaultenv' command to restore the * default environment for some time. */ - if (!strcmp(str, "/dev/defaultenv")) + if (!strcmp(argv[optind], "/dev/defaultenv")) defaultenv = 1; else filename = argv[optind]; - - free(str); } if (scrub) { -- cgit v1.2.3