* grp.cc (read_group): Revert previous change.
* uinfo.cc (pwdgrp::load): Always reset curr_lines.
This commit is contained in:
		| @@ -1,3 +1,8 @@ | ||||
| 2003-08-17  Pierre Humblet  <pierre.humblet@ieee.org> | ||||
|  | ||||
| 	* grp.cc (read_group): Revert previous change. | ||||
| 	* uinfo.cc (pwdgrp::load): Always reset curr_lines. | ||||
|  | ||||
| 2003-08-17  Corinna Vinschen  <corinna@vinschen.de> | ||||
|  | ||||
| 	* errno.cc (errmap): Map ERROR_INVALID_BLOCK_LENGTH to EIO. | ||||
|   | ||||
| @@ -75,10 +75,7 @@ pwdgrp::read_group () | ||||
| { | ||||
|   for (int i = 0; i < gr.curr_lines; i++) | ||||
|     if ((*group_buf)[i].gr_mem != &null_ptr) | ||||
|       { | ||||
|         free ((*group_buf)[i].gr_mem); | ||||
|         (*group_buf)[i].gr_mem = &null_ptr; | ||||
|       } | ||||
|       free ((*group_buf)[i].gr_mem); | ||||
|  | ||||
|   load ("/etc/group"); | ||||
|  | ||||
|   | ||||
| @@ -458,6 +458,7 @@ pwdgrp::load (const char *posix_fname) | ||||
|   if (buf) | ||||
|     free (buf); | ||||
|   buf = NULL; | ||||
|   curr_lines = 0; | ||||
|  | ||||
|   pc.check (posix_fname); | ||||
|   etc_ix = etc::init (etc_ix, pc); | ||||
| @@ -496,7 +497,6 @@ pwdgrp::load (const char *posix_fname) | ||||
| 	      CloseHandle (fh); | ||||
| 	      buf[read_bytes] = '\0'; | ||||
| 	      char *eptr = buf; | ||||
| 	      curr_lines = 0; | ||||
| 	      while ((eptr = add_line (eptr))) | ||||
| 		continue; | ||||
| 	      debug_printf ("%s curr_lines %d", posix_fname, curr_lines); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user