Cuddle up to LKML C style

1 files changed, 186 insertions, 200 deletions

diff --git a/src/mountinfo.c b/src/mountinfo.c
index c5dc60ff..1e15de4b 100644
--- a/src/mountinfo.c
+++ b/src/mountinfo.c
@@ -28,104 +28,98 @@
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
 static char **find_mounts (regex_t *node_regex, regex_t *fstype_regex,
-                           char **mounts, bool list_nodes, bool list_fstype)
+						   char **mounts, bool list_nodes, bool list_fstype)
 {
-  struct statfs *mnts;
-  int nmnts;
-  int i;
-  char **list = NULL;
-
-  if ((nmnts = getmntinfo (&mnts, MNT_NOWAIT)) == 0)
-    eerrorx ("getmntinfo: %s", strerror (errno));
-
-  for (i = 0; i < nmnts; i++)
-    {
-      if (node_regex &&
-          regexec (node_regex, mnts[i].f_mntfromname, 0, NULL, 0) != 0)
-        continue;
-      if (fstype_regex &&
-          regexec (fstype_regex, mnts[i].f_fstypename, 0, NULL, 0) != 0)
-        continue;
-
-      if (mounts)
-        {
-          bool found = false;
-          int j;
-          char *mnt;
-          STRLIST_FOREACH (mounts, mnt, j)
-           if (strcmp (mnt, mnts[i].f_mntonname) == 0)
-             {
-               found = true;
-               break;
-             }
-          if (! found)
-            continue;
-        }
-
-      list = rc_strlist_addsortc (list, list_nodes ?
-                                  mnts[i].f_mntfromname :
-                                  list_fstype ? mnts[i].f_fstypename :
-                                  mnts[i].f_mntonname);
-    }
-
-  return (list);
+	struct statfs *mnts;
+	int nmnts;
+	int i;
+	char **list = NULL;
+
+	if ((nmnts = getmntinfo (&mnts, MNT_NOWAIT)) == 0)
+		eerrorx ("getmntinfo: %s", strerror (errno));
+
+	for (i = 0; i < nmnts; i++) {
+		if (node_regex &&
+			regexec (node_regex, mnts[i].f_mntfromname, 0, NULL, 0) != 0)
+			continue;
+		if (fstype_regex &&
+			regexec (fstype_regex, mnts[i].f_fstypename, 0, NULL, 0) != 0)
+			continue;
+
+		if (mounts) {
+			bool found = false;
+			int j;
+			char *mnt;
+			STRLIST_FOREACH (mounts, mnt, j)
+				if (strcmp (mnt, mnts[i].f_mntonname) == 0) {
+					found = true;
+					break;
+				}
+			if (! found)
+				continue;
+		}
+
+		list = rc_strlist_addsortc (list, list_nodes ?
+									mnts[i].f_mntfromname :
+									list_fstype ? mnts[i].f_fstypename :
+									mnts[i].f_mntonname);
+	}
+
+	return (list);
 }
 
 #elif defined (__linux__)
 static char **find_mounts (regex_t *node_regex, regex_t *fstype_regex,
-                           char **mounts, bool list_nodes, bool list_fstype)
+						   char **mounts, bool list_nodes, bool list_fstype)
 {
-  FILE *fp;
-  char buffer[PATH_MAX * 3];
-  char *p;
-  char *from;
-  char *to;
-  char *fstype;
-  char **list = NULL;
-
-  if ((fp = fopen ("/proc/mounts", "r")) == NULL)
-    eerrorx ("getmntinfo: %s", strerror (errno));
-
-  while (fgets (buffer, sizeof (buffer), fp))
-    {
-      p = buffer;
-      from = strsep (&p, " ");
-      if (node_regex &&
-          regexec (node_regex, from, 0, NULL, 0) != 0)
-        continue;
-
-      to = strsep (&p, " ");
-      fstype = strsep (&p, " ");
-      /* Skip the really silly rootfs */
-      if (strcmp (fstype, "rootfs") == 0)
-        continue;
-      if (fstype_regex &&
-          regexec (fstype_regex, fstype, 0, NULL, 0) != 0)
-        continue;
-
-      if (mounts)
-        {
-          bool found = false;
-          int j;
-          char *mnt;
-          STRLIST_FOREACH (mounts, mnt, j)
-           if (strcmp (mnt, to) == 0)
-             {
-               found = true;
-               break;
-             }
-          if (! found)
-            continue;
-        }
-
-      list = rc_strlist_addsortc (list,
-                                  list_nodes ? 
-                                  list_fstype ? fstype :
-                                  from : to);
-    }
-  fclose (fp);
-
-  return (list);
+	FILE *fp;
+	char buffer[PATH_MAX * 3];
+	char *p;
+	char *from;
+	char *to;
+	char *fstype;
+	char **list = NULL;
+
+	if ((fp = fopen ("/proc/mounts", "r")) == NULL)
+		eerrorx ("getmntinfo: %s", strerror (errno));
+
+	while (fgets (buffer, sizeof (buffer), fp)) {
+		p = buffer;
+		from = strsep (&p, " ");
+		if (node_regex &&
+			regexec (node_regex, from, 0, NULL, 0) != 0)
+			continue;
+
+		to = strsep (&p, " ");
+		fstype = strsep (&p, " ");
+		/* Skip the really silly rootfs */
+		if (strcmp (fstype, "rootfs") == 0)
+			continue;
+		if (fstype_regex &&
+			regexec (fstype_regex, fstype, 0, NULL, 0) != 0)
+			continue;
+
+		if (mounts)	{
+			bool found = false;
+			int j;
+			char *mnt;
+			STRLIST_FOREACH (mounts, mnt, j)
+				if (strcmp (mnt, to) == 0) {
+					found = true;
+					break;
+				}
+			if (! found)
+				continue;
+		}
+
+		list = rc_strlist_addsortc (list,
+									list_nodes ? 
+									list_fstype ? fstype :
+									from : to);
+	}
+	fclose (fp);
+
+	return (list);
 }
 
 #else
@@ -134,113 +128,105 @@ static char **find_mounts (regex_t *node_regex, regex_t *fstype_regex,
 
 int main (int argc, char **argv)
 {
-  int i;
-  regex_t *fstype_regex = NULL;
-  regex_t *node_regex = NULL;
-  regex_t *skip_regex = NULL;
-  char **nodes = NULL;
-  char *node;
-  int result;
-  char buffer[256];
-  bool list_nodes = false;
-  bool list_fstype = false;
-  bool reverse = false;
-  char **mounts = NULL;
-
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], "--fstype-regex") == 0 && (i + 1 < argc))
-        {
-          i++;
-          if (fstype_regex)
-            free (fstype_regex);
-          fstype_regex = rc_xmalloc (sizeof (regex_t));
-          if ((result = regcomp (fstype_regex, argv[i],
-                                 REG_EXTENDED | REG_NOSUB)) != 0)
-            {
-              regerror (result, fstype_regex, buffer, sizeof (buffer));
-              eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
-            }
-          continue;
-        }
-
-      if (strcmp (argv[i], "--node-regex") == 0 && (i + 1 < argc))
-        {
-          i++;
-          if (node_regex)
-            free (node_regex);
-          node_regex = rc_xmalloc (sizeof (regex_t));
-          if ((result = regcomp (node_regex, argv[i],
-                                 REG_EXTENDED | REG_NOSUB)) != 0)
-            {
-              regerror (result, node_regex, buffer, sizeof (buffer));
-              eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
-            }
-          continue;
-        }
-
-      if (strcmp (argv[i], "--skip-regex") == 0 && (i + 1 < argc))
-        {
-          i++;
-          if (skip_regex)
-            free (skip_regex);
-          skip_regex = rc_xmalloc (sizeof (regex_t));
-          if ((result = regcomp (skip_regex, argv[i],
-                                 REG_EXTENDED | REG_NOSUB)) != 0)
-            {
-              regerror (result, skip_regex, buffer, sizeof (buffer));
-              eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
-            }
-          continue;
-        }
-
-      if (strcmp (argv[i], "--fstype") == 0)
-        {
-          list_fstype = true;
-          continue;
-        }
-
-      if (strcmp (argv[i], "--node") == 0)
-        {
-          list_nodes = true;
-          continue;
-        }
-      if (strcmp (argv[i], "--reverse") == 0)
-        {
-          reverse = true;
-          continue;
-        }
-
-      if (argv[i][0] != '/')
-        eerrorx ("%s: `%s' is not a mount point", argv[0], argv[i]);
-
-      mounts = rc_strlist_add (mounts, argv[i]);
-    }
-
-  nodes = find_mounts (node_regex, fstype_regex, mounts,
-                       list_nodes, list_fstype);
-
-  if (node_regex)
-    regfree (node_regex);
-  if (fstype_regex)
-    regfree (fstype_regex);
-
-  if (reverse)
-    rc_strlist_reverse (nodes);
-
-  result = EXIT_FAILURE;
-  STRLIST_FOREACH (nodes, node, i)
-    {
-      if (skip_regex && regexec (skip_regex, node, 0, NULL, 0) == 0)
-        continue;
-      printf ("%s\n", node);
-      result = EXIT_SUCCESS;
-    }
-  rc_strlist_free (nodes);
-
-  if (skip_regex)
-    free (skip_regex);
-
-  exit (result);
+	int i;
+	regex_t *fstype_regex = NULL;
+	regex_t *node_regex = NULL;
+	regex_t *skip_regex = NULL;
+	char **nodes = NULL;
+	char *node;
+	int result;
+	char buffer[256];
+	bool list_nodes = false;
+	bool list_fstype = false;
+	bool reverse = false;
+	char **mounts = NULL;
+
+	for (i = 1; i < argc; i++) {
+		if (strcmp (argv[i], "--fstype-regex") == 0 && (i + 1 < argc)) {
+			i++;
+			if (fstype_regex)
+				free (fstype_regex);
+			fstype_regex = rc_xmalloc (sizeof (regex_t));
+			if ((result = regcomp (fstype_regex, argv[i],
+								   REG_EXTENDED | REG_NOSUB)) != 0)
+			{
+				regerror (result, fstype_regex, buffer, sizeof (buffer));
+				eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
+			}
+			continue;
+		}
+
+		if (strcmp (argv[i], "--node-regex") == 0 && (i + 1 < argc)) {
+			i++;
+			if (node_regex)
+				free (node_regex);
+			node_regex = rc_xmalloc (sizeof (regex_t));
+			if ((result = regcomp (node_regex, argv[i],
+								   REG_EXTENDED | REG_NOSUB)) != 0)
+			{
+				regerror (result, node_regex, buffer, sizeof (buffer));
+				eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
+			}
+			continue;
+		}
+
+		if (strcmp (argv[i], "--skip-regex") == 0 && (i + 1 < argc)) {
+			i++;
+			if (skip_regex)
+				free (skip_regex);
+			skip_regex = rc_xmalloc (sizeof (regex_t));
+			if ((result = regcomp (skip_regex, argv[i],
+								   REG_EXTENDED | REG_NOSUB)) != 0)
+			{
+				regerror (result, skip_regex, buffer, sizeof (buffer));
+				eerrorx ("%s: invalid regex `%s'", argv[0], buffer);
+			}
+			continue;
+		}
+
+		if (strcmp (argv[i], "--fstype") == 0) {
+			list_fstype = true;
+			continue;
+		}
+
+		if (strcmp (argv[i], "--node") == 0) {
+			list_nodes = true;
+			continue;
+		}
+		if (strcmp (argv[i], "--reverse") == 0) {
+			reverse = true;
+			continue;
+		}
+
+		if (argv[i][0] != '/')
+			eerrorx ("%s: `%s' is not a mount point", argv[0], argv[i]);
+
+		mounts = rc_strlist_add (mounts, argv[i]);
+	}
+
+	nodes = find_mounts (node_regex, fstype_regex, mounts,
+						 list_nodes, list_fstype);
+
+	if (node_regex)
+		regfree (node_regex);
+	if (fstype_regex)
+		regfree (fstype_regex);
+
+	if (reverse)
+		rc_strlist_reverse (nodes);
+
+	result = EXIT_FAILURE;
+	STRLIST_FOREACH (nodes, node, i) {
+		if (skip_regex && regexec (skip_regex, node, 0, NULL, 0) == 0)
+			continue;
+		printf ("%s\n", node);
+		result = EXIT_SUCCESS;
+	}
+	rc_strlist_free (nodes);
+
+	if (skip_regex)
+		free (skip_regex);
+
+	exit (result);
 }