From 04fd11b631494e3985d6911dd5876c1860948ba3 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Wed, 7 Apr 2010 10:20:25 -0700 Subject: [PATCH] Fix device name parsing for diskio variables. See: https://sourceforge.net/tracker/?func=detail&aid=2981517&group_id=143975&atid=757308 --- src/core.c | 12 ++++++------ src/diskio.c | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/core.c b/src/core.c index 68997ad..acb41b0 100644 --- a/src/core.c +++ b/src/core.c @@ -372,18 +372,18 @@ struct text_object *construct_text_object(const char *s, const char *arg, long scan_loadgraph_arg(obj, arg); #endif /* X11 */ END OBJ(diskio, &update_diskio) - parse_diskio_arg(obj, arg); + parse_diskio_arg(obj, dev_name(arg)); END OBJ(diskio_read, &update_diskio) - parse_diskio_arg(obj, arg); + parse_diskio_arg(obj, dev_name(arg)); END OBJ(diskio_write, &update_diskio) - parse_diskio_arg(obj, arg); + parse_diskio_arg(obj, dev_name(arg)); #ifdef X11 END OBJ(diskiograph, &update_diskio) - parse_diskiograph_arg(obj, arg); + parse_diskiograph_arg(obj, dev_name(arg)); END OBJ(diskiograph_read, &update_diskio) - parse_diskiograph_arg(obj, arg); + parse_diskiograph_arg(obj, dev_name(arg)); END OBJ(diskiograph_write, &update_diskio) - parse_diskiograph_arg(obj, arg); + parse_diskiograph_arg(obj, dev_name(arg)); #endif /* X11 */ END OBJ(color, 0) #ifdef X11 diff --git a/src/diskio.c b/src/diskio.c index b0986cc..d9b2f3f 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -76,12 +76,6 @@ struct diskio_stat *prepare_diskio_stat(const char *s) if (!s) return &stats; -#if defined(__FreeBSD__) - if (strncmp(s, "/dev/", 5) == 0) { - // supplied a /dev/device arg, so cut off the /dev part - strncpy(device_name, s + 5, text_buffer_size); - } else -#endif strncpy(device_name, s, text_buffer_size); snprintf(stat_name, text_buffer_size, "/dev/%s", device_name); -- 1.7.9.5