@@ -46,6 +46,7 @@ extern char** environ;
4646#include <unistd.h>
4747#endif
4848
49+ #include <stdbool.h>
4950#include <string.h>
5051#include <stdlib.h>
5152
@@ -154,31 +155,34 @@ char** save_ps_args(int argc, char** argv)
154155 */
155156 {
156157 char * end_of_area = NULL ;
157- int non_contiguous_area = 0 ;
158+ bool is_contiguous_area = true ;
158159 int i ;
159160
160161 /*
161162 * check for contiguous argv strings
162163 */
163- for (i = 0 ; ( non_contiguous_area == 0 ) && (i < argc ); i ++ )
164+ for (i = 0 ; is_contiguous_area && (i < argc ); i ++ )
164165 {
165- if (i != 0 && end_of_area + 1 != argv [i ])
166- non_contiguous_area = 1 ;
166+ if (i != 0 && end_of_area + 1 != argv [i ]) {
167+ is_contiguous_area = false;
168+ }
167169 end_of_area = argv [i ] + strlen (argv [i ]);
168170 }
169171
170172 /*
171173 * check for contiguous environ strings following argv
172174 */
173- for (i = 0 ; ( non_contiguous_area == 0 ) && (environ [i ] != NULL ); i ++ )
175+ for (i = 0 ; is_contiguous_area && (environ [i ] != NULL ); i ++ )
174176 {
175- if (end_of_area + 1 != environ [i ])
176- non_contiguous_area = 1 ;
177+ if (end_of_area + 1 != environ [i ]) {
178+ is_contiguous_area = false;
179+ }
177180 end_of_area = environ [i ] + strlen (environ [i ]);
178181 }
179182
180- if (non_contiguous_area != 0 )
183+ if (! is_contiguous_area ) {
181184 goto clobber_error ;
185+ }
182186
183187 ps_buffer = argv [0 ];
184188 ps_buffer_size = end_of_area - argv [0 ];
@@ -188,8 +192,9 @@ char** save_ps_args(int argc, char** argv)
188192 */
189193 new_environ = (char * * ) malloc ((i + 1 ) * sizeof (char * ));
190194 frozen_environ = (char * * ) malloc ((i + 1 ) * sizeof (char * ));
191- if (!new_environ || !frozen_environ )
195+ if (!new_environ || !frozen_environ ) {
192196 goto clobber_error ;
197+ }
193198 for (i = 0 ; environ [i ] != NULL ; i ++ )
194199 {
195200 new_environ [i ] = strdup (environ [i ]);
0 commit comments