[LV-k25-commit] kernel-2.5/arch/vax/tools setcmdline.c,1.2,1.3

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25710

Modified Files:
	setcmdline.c 
Log Message:
- Touchup.


Index: setcmdline.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/tools/setcmdline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setcmdline.c	13 Oct 2003 01:04:50 -0000	1.2
+++ setcmdline.c	25 Apr 2005 15:27:49 -0000	1.3
@@ -7,62 +7,67 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#define COMMAND_LINE_SIZE 256
-#define COMMAND_LINE_OFFSET 0x204
+#define COMMAND_LINE_SIZE	256
+#define COMMAND_LINE_OFFSET	0x204
 
-int called_as(char *str1, char *str2)
-{
-   char *tmp;
-   
-   tmp = strrchr(str1,'/');
-   if (tmp==NULL) tmp=str1; else tmp++;
-//   printf("%s %s, %s\n",str1,str2,tmp);
-   return (!strncmp(tmp,str2,strlen(str2)));
+static int called_as(char *str1, char *str2) {
+	char *tmp;
+
+	tmp = strrchr(str1,'/');
+	if (!tmp)
+		tmp = str1;
+	else
+		tmp++;
+
+	return !strncmp(tmp, str2, strlen(str2));
 }
 
-int main (int argc, char *argv[])
-{
-   int kern_fd;
-   char buffer[COMMAND_LINE_SIZE];
-   
-   if (called_as(argv[0],"showcmdline")) {
-      if (argc < 2) {
-        printf ("usage: showcmdline kernel_image\n");
-        exit(1);
-      } 
-   }else {
-      if (argc < 3) {
-         printf ("usage: setcmdline kernel_image \"command line\"\n");
-         exit(1);
-       }
-   }
-   
-   if ((kern_fd=open(argv[1], O_RDWR))<0) {
-      perror(argv[1]);
-      exit(1);
-   }
-   memset(buffer,0,COMMAND_LINE_SIZE);
+int main (int argc, char *argv[]) {
+	int kern_fd;
+	char buffer[COMMAND_LINE_SIZE];
 
-   if (called_as(argv[0],"setcmdline"))  {
-   
-      if (strlen(argv[2])>=COMMAND_LINE_SIZE) {
-           printf("Warning: Command Line truncated to %d bytes!\n",COMMAND_LINE_SIZE-1);
-      }
-      strncpy(buffer,argv[2],(COMMAND_LINE_SIZE-1));
-      lseek(kern_fd,COMMAND_LINE_OFFSET,SEEK_SET);
-   
-/*      printf("\n\nSetting kernel command line to:\n\t%s\n\n",buffer); */
-      write(kern_fd,buffer,strlen(buffer));
-      write(kern_fd,"\0",1);
-   } else {
-      lseek(kern_fd,COMMAND_LINE_OFFSET,SEEK_SET);
-      read(kern_fd,buffer,(COMMAND_LINE_SIZE-1));
-      printf("\nKernel command line is:\n\t%s\n",buffer);
-   }
-   close(kern_fd);
+	if (called_as(argv[0], "showcmdline")) {
+		if (argc < 2) {
+			printf ("usage: showcmdline kernel_image\n");
+			exit(EXIT_FAILURE);
+		}
+	} else {
+		if (argc < 3) {
+			printf ("usage: setcmdline kernel_image \"command line\"\n");
+			exit(EXIT_FAILURE);
+		}
+	}
 
-   return 0;
+	kern_fd = open(argv[1], O_RDWR);
+	if (kern_fd < 0) {
+		perror(argv[1]);
+		exit(EXIT_FAILURE);
+	}
+
+	memset(buffer, 0, COMMAND_LINE_SIZE);
+
+	if (called_as(argv[0], "setcmdline"))  {
+		/*
+		 * setcmdline
+		 */
+		if (strlen(argv[2]) >= COMMAND_LINE_SIZE) {
+			printf("Warning: Command Line truncated to %d bytes!\n",
+					COMMAND_LINE_SIZE - 1);
+		}
+		strncpy(buffer, argv[2], COMMAND_LINE_SIZE - 1);
+		lseek(kern_fd, COMMAND_LINE_OFFSET, SEEK_SET);
+		write(kern_fd,buffer,strlen(buffer));
+		write(kern_fd,"\0",1);
+	} else {
+		/*
+		 * showcmdline
+		 */
+		lseek(kern_fd, COMMAND_LINE_OFFSET, SEEK_SET);
+		read(kern_fd,buffer, COMMAND_LINE_SIZE - 1);
+		printf("\nKernel command line is:\n\t%s\n", buffer);
+	}
+
+	close(kern_fd);
+	return 0;
 }
 
-   
-