Ignore zeros in the lists passed to %A.

Rev: src/format.c:1.15
Rev: src/format.h:1.12

src/format.c

@@ -148,16 +148,20 @@ UINT32 ssh_vformat_length(char *f, va_list args)
 	    case 'A':
 	      {
 		int *atom = va_arg(args, int *);
-		int i;
+		int n;
 
-		if (atom[0])
-		  { /* Non empty */
-		    for(i = 0; atom[i] > 0; i++)
-		      length += get_atom_length(atom[i]) + 1;
-
-		    /* One ','-character less than the number of atoms */
-		    length--;
+		for(n = 0; *atom >= 0; atom++)
+		  {
+		    if (*atom)
+		      {
+			n++;
+			length += get_atom_length(*atom);
 		      }
+		  }
+		if (n)
+		  /* One ','-character less than the number of atoms */
+		  length += (n-1);
+		    
 		if (!literal)
 		  length += 4;
 		f++;
@@ -333,23 +337,25 @@ UINT32 ssh_vformat(char *f, UINT8 *buffer, va_list args)
 	      {
 		int *atom = va_arg(args, int *);
 		UINT8 *start = buffer; /* Where to store the length */
-		int i;
+		int n;
 		
 		if (!literal)
 		  buffer += 4;
 		
-		if (atom[0] > 0)
+		for(n = 0; *atom >= 0; atom++)
 		  {
-		    UINT32 length = get_atom_length(atom[0]);
-		    memcpy(buffer, get_atom_name(atom[0]), length);
-		    buffer += length;
-		    
-		    for (i = 1; atom[i] > 0; i++)
+		    if (*atom)
 		      {
+			UINT32 length = get_atom_length(*atom);
+			
+			if (n)
+			  /* Not the first atom */
 			  *buffer++ = ',';
-			length = get_atom_length(atom[i]);
-			memcpy(buffer, get_atom_name(atom[i]), length);
+
+			memcpy(buffer, get_atom_name(atom[0]), length);
 			buffer += length;
+
+			n++;
 		      }
 		  }
 

src/format.h

@@ -52,7 +52,7 @@
  *
  * %A  Insert a string containing a list of atoms. The corresponding
  *     argument sublist should be a int* pointing to a list of atoms,
- *     terminated with -1.
+ *     terminated with -1. Zero elements are allowed and ignored.
  *
  * %X  Insert a string containing a list of atoms. The corresponding
  *     argument sublist should be terminated with a zero. (Not used)