svn commit: trunk/busybox: console-tools networking scripts util-li etc...
vda at busybox.net
vda at busybox.net
Sun Jun 3 22:30:24 UTC 2007
Author: vda
Date: 2007-06-03 15:30:22 -0700 (Sun, 03 Jun 2007)
New Revision: 18736
Log:
find_stray_communal_vars: script which finds communal variables
resize: remove globals var
mdev: remove globals var
Added:
trunk/busybox/scripts/find_stray_communal_vars
Modified:
trunk/busybox/console-tools/resize.c
trunk/busybox/networking/telnet.c
trunk/busybox/util-linux/mdev.c
Changeset:
Modified: trunk/busybox/console-tools/resize.c
===================================================================
--- trunk/busybox/console-tools/resize.c 2007-06-03 19:37:05 UTC (rev 18735)
+++ trunk/busybox/console-tools/resize.c 2007-06-03 22:30:22 UTC (rev 18736)
@@ -11,16 +11,15 @@
#define ESC "\033"
-struct termios old;
+#define old_termios (*(struct termios*)&bb_common_bufsiz1)
static void
onintr(int sig ATTRIBUTE_UNUSED)
{
- tcsetattr(STDERR_FILENO, TCSANOW, &old);
+ tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
exit(1);
}
-
int resize_main(int argc, char **argv);
int resize_main(int argc, char **argv)
{
@@ -34,8 +33,8 @@
* and operate on it - should we do the same?
*/
- tcgetattr(STDERR_FILENO, &old); /* fiddle echo */
- new = old;
+ tcgetattr(STDERR_FILENO, &old_termios); /* fiddle echo */
+ new = old_termios;
new.c_cflag |= (CLOCAL | CREAD);
new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
signal(SIGINT, onintr);
@@ -60,7 +59,7 @@
* (gotten via TIOCGWINSZ) and recomputing *pixel values */
ret = ioctl(STDERR_FILENO, TIOCSWINSZ, &w);
- tcsetattr(STDERR_FILENO, TCSANOW, &old);
+ tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
if (ENABLE_FEATURE_RESIZE_PRINT)
printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;\n",
Modified: trunk/busybox/networking/telnet.c
===================================================================
--- trunk/busybox/networking/telnet.c 2007-06-03 19:37:05 UTC (rev 18735)
+++ trunk/busybox/networking/telnet.c 2007-06-03 22:30:22 UTC (rev 18736)
@@ -79,7 +79,7 @@
struct termios termios_raw;
};
-#define G (*(struct globals*)bb_common_bufsiz1)
+#define G (*(struct globals*)&bb_common_bufsiz1)
/* Function prototypes */
Added: trunk/busybox/scripts/find_stray_communal_vars
===================================================================
--- trunk/busybox/scripts/find_stray_communal_vars (rev 0)
+++ trunk/busybox/scripts/find_stray_communal_vars 2007-06-03 22:30:22 UTC (rev 18736)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Communal variables are elusize, then don't show in size output!
+# This script will show all communals in *.o, sorted by size
+
+find -name '*.o' \
+| while read name; do
+ b=`basename "$name"`
+ nm "$name" | sed "s/^/$b: /"
+done | grep -i ' c ' | sort -k2
Property changes on: trunk/busybox/scripts/find_stray_communal_vars
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c 2007-06-03 19:37:05 UTC (rev 18735)
+++ trunk/busybox/util-linux/mdev.c 2007-06-03 22:30:22 UTC (rev 18736)
@@ -12,15 +12,13 @@
#include "libbb.h"
#include "xregex.h"
-#define DEV_PATH "/dev"
-
-struct mdev_globals
-{
+struct globals {
int root_major, root_minor;
-} mdev_globals;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define root_major (G.root_major)
+#define root_minor (G.root_minor)
-#define bbg mdev_globals
-
/* mknod in /dev based on a path like "/sys/block/hda/hda1" */
static void make_device(char *path, int delete)
{
@@ -174,7 +172,7 @@
if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
bb_perror_msg_and_die("mknod %s", device_name);
- if (major == bbg.root_major && minor == bbg.root_minor)
+ if (major == root_major && minor == root_minor)
symlink(device_name, "root");
if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid);
@@ -237,7 +235,7 @@
char *env_path;
RESERVE_CONFIG_BUFFER(temp,PATH_MAX);
- xchdir(DEV_PATH);
+ xchdir("/dev");
/* Scan */
@@ -245,8 +243,8 @@
struct stat st;
xstat("/", &st);
- bbg.root_major = major(st.st_dev);
- bbg.root_minor = minor(st.st_dev);
+ root_major = major(st.st_dev);
+ root_minor = minor(st.st_dev);
strcpy(temp,"/sys/block");
find_dev(temp);
strcpy(temp,"/sys/class");
More information about the busybox-cvs
mailing list