attempt to regularize atoi mess.

2 files changed, 23 insertions, 23 deletions

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 964a221..f2d90b6 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -60,31 +60,31 @@ int run_parts_main(int argc, char **argv)
 
 	umask(022);
 
-	while ((opt = getopt_long (argc, argv, "tu:a:",
+	while ((opt = getopt_long(argc, argv, "tu:a:",
 					runparts_long_options, NULL)) > 0)
 	{
 		switch (opt) {
-			/* Enable test mode */
-			case 't':
-				test_mode++;
-				break;
-			/* Set the umask of the programs executed */
-			case 'u':
-				/* Check and set the umask of the program executed. As stated in the original
-				 * run-parts, the octal conversion in libc is not foolproof; it will take the
-				 * 8 and 9 digits under some circumstances. We'll just have to live with it.
-				 */
-				umask(bb_xgetlarg(optarg, 8, 0, 07777));
-				break;
-			/* Pass an argument to the programs */
-			case 'a':
-				/* Add an argument to the commands that we will call.
-				 * Called once for every argument. */
-				args = xrealloc(args, (argcount + 2) * (sizeof(char *)));
-				args[argcount++] = optarg;
-				break;
-			default:
-				bb_show_usage();
+		/* Enable test mode */
+		case 't':
+			test_mode++;
+			break;
+		/* Set the umask of the programs executed */
+		case 'u':
+			/* Check and set the umask of the program executed. As stated in the original
+			 * run-parts, the octal conversion in libc is not foolproof; it will take the
+			 * 8 and 9 digits under some circumstances. We'll just have to live with it.
+			 */
+			umask(xstrtoul_range(optarg, 8, 0, 07777));
+			break;
+		/* Pass an argument to the programs */
+		case 'a':
+			/* Add an argument to the commands that we will call.
+			 * Called once for every argument. */
+			args = xrealloc(args, (argcount + 2) * (sizeof(char *)));
+			args[argcount++] = optarg;
+			break;
+		default:
+			bb_show_usage();
 		}
 	}
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 57f42d8..6ced9ca 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -260,7 +260,7 @@ int start_stop_daemon_main(int argc, char **argv)
 
 //	USE_FEATURE_START_STOP_DAEMON_FANCY(
 //		if (retry_arg)
-//			retries = bb_xgetlarg(retry_arg, 10, 0, INT_MAX);
+//			retries = xatoi_u(retry_arg);
 //	)
 	argc -= optind;
 	argv += optind;