svn commit: trunk/busybox/miscutils

vda at busybox.net vda at busybox.net
Tue Feb 19 18:26:41 UTC 2008


Author: vda
Date: 2008-02-19 10:26:40 -0800 (Tue, 19 Feb 2008)
New Revision: 21069

Log:
microcom: tiny shrink, adding comments



Modified:
   trunk/busybox/miscutils/microcom.c


Changeset:
Modified: trunk/busybox/miscutils/microcom.c
===================================================================
--- trunk/busybox/miscutils/microcom.c	2008-02-19 14:13:20 UTC (rev 21068)
+++ trunk/busybox/miscutils/microcom.c	2008-02-19 18:26:40 UTC (rev 21069)
@@ -51,18 +51,17 @@
 	enum {
 		OPT_X = 1 << 0, // do not respect Ctrl-X, Ctrl-@
 		OPT_s = 1 << 1, // baudrate
-		OPT_d = 1 << 2, // wait for device response, msecs
+		OPT_d = 1 << 2, // wait for device response, ms
 		OPT_t = 1 << 3, // timeout, ms
 	};
 	speed_t speed = 9600;
 	int delay = -1;
 	int timeout = -1;
+	unsigned opts;
 
 	// fetch options
-	unsigned opts;
-	opt_complementary = "=1:s+:d+:t+"; // exactly one arg should be there
+	opt_complementary = "=1:s+:d+:t+"; // exactly one arg, numeric options
 	opts = getopt32(argv, "Xs:d:t:", &speed, &delay, &timeout);
-
 //	argc -= optind;
 	argv += optind;
 
@@ -71,14 +70,16 @@
 	device_lock_file = xasprintf("/var/lock/LCK..%s", device_lock_file);
 	sfd = open(device_lock_file, O_CREAT | O_WRONLY | O_TRUNC | O_EXCL, 0644);
 	if (sfd < 0) {
+		// device already locked -> bail out
 		if (errno == EEXIST)
 			bb_perror_msg_and_die("can't create %s", device_lock_file);
+		// can't create lock -> don't care
 		if (ENABLE_FEATURE_CLEAN_UP)
 			free(device_lock_file);
 		device_lock_file = NULL;
-	}
-	if (sfd > 0) {
-		// %4d to make mgetty happy. It treats 4-bytes lock files as binary,
+	} else {
+		// %4d to make concurrent mgetty (if any) happy.
+		// Mgetty treats 4-bytes lock files as binary,
 		// not text, PID. Making 5+ char file. Brrr...
 		char *s = xasprintf("%4d\n", getpid());
 		write(sfd, s, strlen(s));




More information about the busybox-cvs mailing list