MFH

Sponsored by:	The FreeBSD Foundation

3 files changed, 10 insertions, 8 deletions

diff --git a/bin/dd/args.c b/bin/dd/args.c
index 1cbf3b3..db8d445 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -360,10 +360,10 @@ c_conv(const void *a, const void *b)
 	    ((const struct conv *)b)->name));
 }
 
-static uintmax_t
+static intmax_t
 postfix_to_mult(const char expr)
 {
-	uintmax_t mult;
+	intmax_t mult;
 
 	mult = 0;
 	switch (expr) {
@@ -407,8 +407,10 @@ postfix_to_mult(const char expr)
  *	3) A positive decimal number followed by a 'k' or 'K' (mult by 1 << 10).
  *	4) A positive decimal number followed by a 'm' or 'M' (mult by 1 << 20).
  *	5) A positive decimal number followed by a 'g' or 'G' (mult by 1 << 30).
- *	5) A positive decimal number followed by a 'w' or 'W' (mult by sizeof int).
- *	6) Two or more positive decimal numbers (with/without [BbKkMmGgWw])
+ *	6) A positive decimal number followed by a 't' or 'T' (mult by 1 << 40).
+ *	7) A positive decimal number followed by a 'p' or 'P' (mult by 1 << 50).
+ *	8) A positive decimal number followed by a 'w' or 'W' (mult by sizeof int).
+ *	9) Two or more positive decimal numbers (with/without [BbKkMmGgWw])
  *	   separated by 'x' or 'X' (also '*' for backwards compatibility),
  *	   specifying the product of the indicated values.
  */
@@ -419,7 +421,7 @@ get_num(const char *val)
 	char *expr;
 
 	errno = 0;
-	num = strtouq(val, &expr, 0);
+	num = strtoumax(val, &expr, 0);
 	if (errno != 0)				/* Overflow or underflow. */
 		err(1, "%s", oper);
 	
@@ -469,7 +471,7 @@ get_off_t(const char *val)
 	char *expr;
 
 	errno = 0;
-	num = strtoq(val, &expr, 0);
+	num = strtoimax(val, &expr, 0);
 	if (errno != 0)				/* Overflow or underflow. */
 		err(1, "%s", oper);
 	
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index 8c814ce..abdc450 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 
 /* Ignore system-processes (if '-S' flag is not specified) and myself. */
 #define	PSKIP(kp)	((kp)->ki_pid == mypid ||			\
-			 (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
+			 (!kthreads && ((kp)->ki_flag & P_KPROC) != 0))
 
 enum listtype {
 	LT_GENERIC,
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index e00d313..3d7c738 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -318,7 +318,7 @@ the include file
 .Bl -column P_SINGLE_BOUNDARY 0x40000000
 .It Dv "P_ADVLOCK" Ta No "0x00001" Ta "Process may hold a POSIX advisory lock"
 .It Dv "P_CONTROLT" Ta No "0x00002" Ta "Has a controlling terminal"
-.It Dv "P_KTHREAD" Ta No "0x00004" Ta "Kernel thread"
+.It Dv "P_KPROC" Ta No "0x00004" Ta "Kernel process"
 .It Dv "P_FOLLOWFORK" Ta No "0x00008" Ta "Attach debugger to new children"
 .It Dv "P_PPWAIT" Ta No "0x00010" Ta "Parent is waiting for child to exec/exit"
 .It Dv "P_PROFIL" Ta No "0x00020" Ta "Has started profiling"