From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 30 Oct 2011 14:02:00 +0000 (+0100)
Subject: tunelp: fix coding style
X-Git-Tag: v2.21-rc1~194^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61319c6e3e3915bc917bcd2d62521bb2d266320d;p=thirdparty%2Futil-linux.git

tunelp: fix coding style

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index f1220ef4d5..53693ecdf1 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -1,10 +1,10 @@
-/****************************************************************************\
-*	Copyright (C) 1992-1997 Michael K. Johnson, johnsonm@redhat.com      *
-*									     *
-*	This file is licensed under the terms of the GNU General             *
-*	Public License, version 2, or any later version.  See file COPYING   *
-*	for information on distribution conditions.			     *
-\****************************************************************************/
+/*
+ * Copyright (C) 1992-1997 Michael K. Johnson, johnsonm@redhat.com
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License, version 2, or any later version.  See file COPYING for
+ * information on distribution conditions.
+ */
 
 /*
  * $Log: tunelp.c,v $
@@ -49,243 +49,264 @@
  *
  */
 
-#include <unistd.h>
-#include <stdio.h>
+#include <errno.h>
 #include <fcntl.h>
-/* #include <linux/fs.h> */
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "lp.h"
-#include "xalloc.h"
 #include "nls.h"
+#include "xalloc.h"
 
 struct command {
-  long op;
-  long val;
-  struct command *next;
+	long op;
+	long val;
+	struct command *next;
 };
 
-
-static void
-print_usage(char *progname) {
-  printf(_("Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
-	   "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-	   "          -T [on|off] ]\n"),
-	 progname);
-  exit (1);
+static void print_usage(char *progname)
+{
+	printf(_
+	       ("Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+		"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+		"          -T [on|off] ]\n"), progname);
+	exit(1);
 }
 
-static void
-print_version(char *progname) {
-  printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
+static void print_version(char *progname)
+{
+	printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 }
 
 static char *progname;
 
-static long
-get_val(char *val) {
-  long ret;
-  if (!(sscanf(val, "%ld", &ret) == 1)) {
-    fprintf(stderr, _("%s: bad value\n"), progname);
-    exit(3);
-  }
-  return ret;
+static long get_val(char *val)
+{
+	long ret;
+	if (!(sscanf(val, "%ld", &ret) == 1)) {
+		fprintf(stderr, _("%s: bad value\n"), progname);
+		exit(3);
+	}
+	return ret;
 }
 
-
-static long
-get_onoff(char *val) {
-  if (!strncasecmp("on", val, 2))
-    return 1;
-  return 0;
+static long get_onoff(char *val)
+{
+	if (!strncasecmp("on", val, 2))
+		return 1;
+	return 0;
 }
 
-int
-main (int argc, char ** argv) {
-  int c, fd, irq, status, show_irq, offset = 0, retval;
-  char *filename, *p;
-  struct stat statbuf;
-  struct command *cmds, *cmdst;
+int main(int argc, char **argv)
+{
+	int c, fd, irq, status, show_irq, offset = 0, retval;
+	char *filename, *p;
+	struct stat statbuf;
+	struct command *cmds, *cmdst;
 
-  progname = argv[0];
-  if ((p = strrchr(progname, '/')) != NULL)
-	  progname = p+1;
+	progname = argv[0];
+	if ((p = strrchr(progname, '/')) != NULL)
+		progname = p + 1;
 
-  setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE, LOCALEDIR);
-  textdomain(PACKAGE);
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
 
-  if (argc < 2) print_usage(progname);
+	if (argc < 2)
+		print_usage(progname);
 
-  cmdst = cmds = xmalloc(sizeof(struct command));
-  cmds->next = 0;
+	cmdst = cmds = xmalloc(sizeof(struct command));
+	cmds->next = 0;
 
-  show_irq = 1;
-  while ((c = getopt(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV")) != -1) {
-    switch (c) {
-    case 'h':
-      print_usage(progname);
-      break;
-    case 'i':
-      cmds->op = LPSETIRQ;
-      cmds->val = get_val(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 't':
-      cmds->op = LPTIME;
-      cmds->val = get_val(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 'c':
-      cmds->op = LPCHAR;
-      cmds->val = get_val(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 'w':
-      cmds->op = LPWAIT;
-      cmds->val = get_val(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 'a':
-      cmds->op = LPABORT;
-      cmds->val = get_onoff(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 'q':
-      if (get_onoff(optarg)) {
-        show_irq=1;
-      } else {
-        show_irq=0;
-      }
+	show_irq = 1;
+	while ((c = getopt(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV")) != -1) {
+		switch (c) {
+		case 'h':
+			print_usage(progname);
+			break;
+		case 'i':
+			cmds->op = LPSETIRQ;
+			cmds->val = get_val(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 't':
+			cmds->op = LPTIME;
+			cmds->val = get_val(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 'c':
+			cmds->op = LPCHAR;
+			cmds->val = get_val(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 'w':
+			cmds->op = LPWAIT;
+			cmds->val = get_val(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 'a':
+			cmds->op = LPABORT;
+			cmds->val = get_onoff(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 'q':
+			if (get_onoff(optarg)) {
+				show_irq = 1;
+			} else {
+				show_irq = 0;
+			}
 #ifdef LPGETSTATUS
-    case 'o':
-      cmds->op = LPABORTOPEN;
-      cmds->val = get_onoff(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 'C':
-      cmds->op = LPCAREFUL;
-      cmds->val = get_onoff(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
-    case 's':
-      show_irq = 0;
-      cmds->op = LPGETSTATUS;
-      cmds->val = 0;
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
+		case 'o':
+			cmds->op = LPABORTOPEN;
+			cmds->val = get_onoff(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 'C':
+			cmds->op = LPCAREFUL;
+			cmds->val = get_onoff(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
+		case 's':
+			show_irq = 0;
+			cmds->op = LPGETSTATUS;
+			cmds->val = 0;
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
 #endif
 #ifdef LPRESET
-    case 'r':
-      cmds->op = LPRESET;
-      cmds->val = 0;
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
+		case 'r':
+			cmds->op = LPRESET;
+			cmds->val = 0;
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
 #endif
 #ifdef LPTRUSTIRQ
-    case 'T':
-      /* Note: this will do the wrong thing on 2.0.36 when compiled under 2.2.x */
-      cmds->op = LPTRUSTIRQ;
-      cmds->val = get_onoff(optarg);
-      cmds->next = xmalloc(sizeof(struct command));
-      cmds = cmds->next; cmds->next = 0;
-      break;
+		case 'T':
+			/* Note: this will do the wrong thing on
+			 * 2.0.36 when compiled under 2.2.x
+			 */
+			cmds->op = LPTRUSTIRQ;
+			cmds->val = get_onoff(optarg);
+			cmds->next = xmalloc(sizeof(struct command));
+			cmds = cmds->next;
+			cmds->next = 0;
+			break;
 #endif
-    case 'v':
-    case 'V':
-      print_version(progname);
-      exit(0);
-    default:
-      print_usage(progname);
-    }
-  }
-
-  if (optind != argc-1)
-    print_usage(progname);
+		case 'v':
+		case 'V':
+			print_version(progname);
+			exit(0);
+		default:
+			print_usage(progname);
+		}
+	}
 
-  filename = strdup(argv[optind]);
-  fd = open(filename, O_WRONLY|O_NONBLOCK, 0);
-  /* Need to open O_NONBLOCK in case ABORTOPEN is already set and
-     printer is off or off-line or in an error condition.  Otherwise
-     we would abort... */
-  if (fd < 0) {
-    perror(filename);
-    return -1;
-  }
+	if (optind != argc - 1)
+		print_usage(progname);
 
-  fstat(fd, &statbuf);
+	filename = strdup(argv[optind]);
+	fd = open(filename, O_WRONLY | O_NONBLOCK, 0);
+	/* Need to open O_NONBLOCK in case ABORTOPEN is already set
+	 * and printer is off or off-line or in an error condition.
+	 * Otherwise we would abort...
+         */
+	if (fd < 0) {
+		perror(filename);
+		return -1;
+	}
 
-  if(!S_ISCHR(statbuf.st_mode)) {
-    printf(_("%s: %s not an lp device.\n"), argv[0], filename);
-    print_usage(progname);
-  }
+	fstat(fd, &statbuf);
 
-  /* Allow for binaries compiled under a new kernel to work on the old ones */
-  /* The irq argument to ioctl isn't touched by the old kernels, but we don't */
-  /*  want to cause the kernel to complain if we are using a new kernel */
-  if (LPGETIRQ >= 0x0600 && ioctl(fd, LPGETIRQ, &irq) < 0 && errno == EINVAL)
-    offset = 0x0600;	/* We don't understand the new ioctls */
+	if (!S_ISCHR(statbuf.st_mode)) {
+		printf(_("%s: %s not an lp device.\n"), argv[0], filename);
+		print_usage(progname);
+	}
+	/* Allow for binaries compiled under a new kernel to work on
+	 * the old ones The irq argument to ioctl isn't touched by
+	 * the old kernels, but we don't want to cause the kernel to
+	 * complain if we are using a new kernel
+	 */
+	if (LPGETIRQ >= 0x0600 && ioctl(fd, LPGETIRQ, &irq) < 0
+	    && errno == EINVAL)
+	        /* We don't understand the new ioctls */
+		offset = 0x0600;
 
-  cmds = cmdst;
-  while (cmds->next) {
+	cmds = cmdst;
+	while (cmds->next) {
 #ifdef LPGETSTATUS
-    if (cmds->op == LPGETSTATUS) {
-      status = 0xdeadbeef;
-      retval = ioctl(fd, LPGETSTATUS - offset, &status);
-      if (retval < 0)
-	perror(_("LPGETSTATUS error"));
-      else {
-        if (status == (int) 0xdeadbeef)	/* a few 1.1.7x kernels will do this */
-          status = retval;
-	printf(_("%s status is %d"), filename, status);
-	if (!(status & LP_PBUSY)) printf(_(", busy"));
-	if (!(status & LP_PACK)) printf(_(", ready"));
-	if ((status & LP_POUTPA)) printf(_(", out of paper"));
-	if ((status & LP_PSELECD)) printf(_(", on-line"));
-	if (!(status & LP_PERRORP)) printf(_(", error"));
-	printf("\n");
-      }
-    } else
+		if (cmds->op == LPGETSTATUS) {
+			status = 0xdeadbeef;
+			retval = ioctl(fd, LPGETSTATUS - offset, &status);
+			if (retval < 0)
+				perror(_("LPGETSTATUS error"));
+			else {
+				if (status == (int)0xdeadbeef)
+					/* a few 1.1.7x kernels will do this */
+					status = retval;
+				printf(_("%s status is %d"), filename, status);
+				if (!(status & LP_PBUSY))
+					printf(_(", busy"));
+				if (!(status & LP_PACK))
+					printf(_(", ready"));
+				if ((status & LP_POUTPA))
+					printf(_(", out of paper"));
+				if ((status & LP_PSELECD))
+					printf(_(", on-line"));
+				if (!(status & LP_PERRORP))
+					printf(_(", error"));
+				printf("\n");
+			}
+		} else
 #endif /* LPGETSTATUS */
-    if (ioctl(fd, cmds->op - offset, cmds->val) < 0) {
-      perror(_("tunelp: ioctl failed"));
-    }
-    cmdst = cmds;
-    cmds = cmds->next;
-    free(cmdst);
-  }
+		if (ioctl(fd, cmds->op - offset, cmds->val) < 0) {
+			perror(_("tunelp: ioctl failed"));
+		}
+		cmdst = cmds;
+		cmds = cmds->next;
+		free(cmdst);
+	}
 
-  if (show_irq) {
-    irq = 0xdeadbeef;
-    retval = ioctl(fd, LPGETIRQ - offset, &irq);
-    if (retval == -1) {
-      perror(_("LPGETIRQ error"));
-      exit(4);
-    }
-    if (irq == (int) 0xdeadbeef)		/* up to 1.1.77 will do this */
-      irq = retval;
-    if (irq)
-      printf(_("%s using IRQ %d\n"), filename, irq);
-    else
-      printf(_("%s using polling\n"), filename);
-  }
+	if (show_irq) {
+		irq = 0xdeadbeef;
+		retval = ioctl(fd, LPGETIRQ - offset, &irq);
+		if (retval == -1) {
+			perror(_("LPGETIRQ error"));
+			exit(4);
+		}
+		if (irq == (int)0xdeadbeef)
+		        /* up to 1.1.77 will do this */
+			irq = retval;
+		if (irq)
+			printf(_("%s using IRQ %d\n"), filename, irq);
+		else
+			printf(_("%s using polling\n"), filename);
+	}
 
-  close(fd);
+	close(fd);
 
-  return 0;
+	return 0;
 }