add suffix support between fields in sinfo/squeue long format

This change adds the ability to add suffix value between fields in the
long formats of sinfo and squeue so that we can duplicate the behavior
of the short options. For example, there was no way to replicate something
like "%P %V" in squeue as something like "partition:9,cluster:8" would
just run the two fields together without a space and something like
"partition:9 ,cluster:8" would generate an error. This change treats
anything between the number and comma as a suffix to be included in
the output and make this work.

bug 7186

src/sinfo/opts.c

@@ -1249,7 +1249,7 @@ static void
 _parse_long_token( char *token, char *sep, int *field_size, bool *right_justify,
 		   char **suffix)
 {
-	char *ptr;
+	char *end_ptr = NULL, *ptr;
 
 	xassert(token);
 	ptr = strchr(token, ':');
@@ -1261,7 +1261,9 @@ _parse_long_token( char *token, char *sep, int *field_size, bool *right_justify,
 		} else {
 			*right_justify = false;
 		}
-		*field_size = atoi(ptr + 1);
+		*field_size = strtol(ptr + 1, &end_ptr, 10);
+		if (end_ptr[0] != '\0')
+			*suffix = xstrdup(end_ptr);
 	} else {
 		*right_justify = false;
 		*field_size = 20;

src/squeue/opts.c

@@ -1787,7 +1787,7 @@ static void
 _parse_long_token( char *token, char *sep, int *field_size, bool *right_justify,
 		   char **suffix)
 {
-	char *ptr;
+	char *end_ptr = NULL, *ptr;
 
 	xassert(token);
 	ptr = strchr(token, ':');
@@ -1799,7 +1799,9 @@ _parse_long_token( char *token, char *sep, int *field_size, bool *right_justify,
 		} else {
 			*right_justify = false;
 		}
-		*field_size = atoi(ptr + 1);
+		*field_size = strtol(ptr + 1, &end_ptr, 10);
+		if (end_ptr[0] != '\0')
+			*suffix = xstrdup(end_ptr);
 	} else {
 		*right_justify = false;
 		*field_size = 20;