svn commit: trunk/busybox/sysklogd

[aldot at busybox.net]

Author: aldot
Date: 2006-06-01 07:36:14 -0700 (Thu, 01 Jun 2006)
New Revision: 15260

Log:
- shrink logread a bit.
   text    data     bss     dec     hex filename
    862      26     188    1076     434 logread.o.orig
    825      26     188    1039     40f logread.o


Modified:
   trunk/busybox/sysklogd/logread.c


Changeset:
Modified: trunk/busybox/sysklogd/logread.c
===================================================================
--- trunk/busybox/sysklogd/logread.c	2006-06-01 13:17:49 UTC (rev 15259)
+++ trunk/busybox/sysklogd/logread.c	2006-06-01 14:36:14 UTC (rev 15260)
@@ -6,24 +6,11 @@
  *
  * Maintainer: Gennady Feldman <gfeldman at gena01.com> as of Mar 12, 2001
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +21,6 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <unistd.h>
-#include "busybox.h"
 
 static const long KEY_ID = 0x414e4547; /*"GENA"*/
 
@@ -80,7 +66,7 @@
 	int i;
 	int follow=0;
 
-	if (argc == 2 && strcmp(argv[1],"-f")==0) {
+	if (argc == 2 && argv[1][0]=='-' && argv[1][1]=='f') {
 		follow = 1;
 	} else {
 		/* no options, no getopt */
@@ -88,7 +74,7 @@
 			bb_show_usage();
 	}
 
-	// handle intrrupt signal
+	// handle interrupt signal
 	if (setjmp(jmp_env)) goto output_end;
 
 	// attempt to redefine ^C signal
@@ -131,9 +117,7 @@
 		log_len = buf->tail - i;
 		if (log_len < 0)
 			log_len += buf->size;
-		buf_data = (char *)malloc(log_len);
-		if (!buf_data)
-			error_exit("malloc failed");
+		buf_data = (char *)xmalloc(log_len);
 
 		if (buf->tail < i) {
 			memcpy(buf_data, buf->data+i, buf->size-i);
@@ -178,7 +162,7 @@
 }
 
 static void error_exit(const char *str){
-	perror(str);
+	bb_perror_msg(str);
 	//release all acquired resources
 	if (log_shmid != -1)
 		shmdt(buf);