diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
| commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
| tree | 6e0ff0341c69839e268459a199682628bae734ed /util-linux/mdev.c | |
| parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
| parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
| download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/mdev.c')
| -rw-r--r-- | util-linux/mdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 37fa56827..37514eb54 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
| @@ -97,6 +97,7 @@ | |||
| 97 | //usage: "If /dev/mdev.log file exists, debug log will be appended to it." | 97 | //usage: "If /dev/mdev.log file exists, debug log will be appended to it." |
| 98 | 98 | ||
| 99 | #include "libbb.h" | 99 | #include "libbb.h" |
| 100 | #include "common_bufsiz.h" | ||
| 100 | #include "xregex.h" | 101 | #include "xregex.h" |
| 101 | 102 | ||
| 102 | /* "mdev -s" scans /sys/class/xxx, looking for directories which have dev | 103 | /* "mdev -s" scans /sys/class/xxx, looking for directories which have dev |
| @@ -285,8 +286,9 @@ struct globals { | |||
| 285 | struct rule cur_rule; | 286 | struct rule cur_rule; |
| 286 | char timestr[sizeof("HH:MM:SS.123456")]; | 287 | char timestr[sizeof("HH:MM:SS.123456")]; |
| 287 | } FIX_ALIASING; | 288 | } FIX_ALIASING; |
| 288 | #define G (*(struct globals*)&bb_common_bufsiz1) | 289 | #define G (*(struct globals*)bb_common_bufsiz1) |
| 289 | #define INIT_G() do { \ | 290 | #define INIT_G() do { \ |
| 291 | setup_common_bufsiz(); \ | ||
| 290 | IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \ | 292 | IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \ |
| 291 | IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \ | 293 | IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \ |
| 292 | } while (0) | 294 | } while (0) |
