[uClibc-cvs] uClibc/libc/pwd_grp pwd_grp.c, NONE, 1.1 Makefile, 1.24, 1.25 __getgrent_r.c, 1.3, NONE __getpwent_r.c, 1.7, NONE __getspent_r.c, 1.6, NONE __sgetspent_r.c, 1.4, NONE config.h, 1.7, NONE fgetgrent.c, 1.8, NONE fgetpwent.c, 1.10, NONE fgetspent.c, 1.6, NONE getgrgid.c, 1.9, NONE getgrnam.c, 1.9, NONE getpw.c, 1.5, NONE getpwnam.c, 1.11, NONE getpwuid.c, 1.10, NONE getspnam.c, 1.6, NONE getspuid.c, 1.6, NONE grent.c, 1.12, NONE initgroups.c, 1.12, NONE putgrent.c, 1.1, NONE putpwent.c, 1.6, NONE putspent.c, 1.3, NONE pwent.c, 1.16, NONE sgetspent.c, 1.6, NONE spent.c, 1.7, NONE

Manuel Novoa III mjn3 at uclibc.org
Thu Nov 6 20:56:07 UTC 2003


Update of /var/cvs/uClibc/libc/pwd_grp
In directory winder:/tmp/cvs-serv4988

Modified Files:
	Makefile 
Added Files:
	pwd_grp.c 
Removed Files:
	__getgrent_r.c __getpwent_r.c __getspent_r.c __sgetspent_r.c 
	config.h fgetgrent.c fgetpwent.c fgetspent.c getgrgid.c 
	getgrnam.c getpw.c getpwnam.c getpwuid.c getspnam.c getspuid.c 
	grent.c initgroups.c putgrent.c putpwent.c putspent.c pwent.c 
	sgetspent.c spent.c 
Log Message:
Rewrite the pwd.h, grp.h, and shadow.h functions (except lckpwdf/ulckpwdf).


--- pwent.c DELETED ---

--- getpwuid.c DELETED ---

--- NEW FILE: pwd_grp.c ---
/*  Copyright (C) 2003     Manuel Novoa III
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
 *  License as published by the Free Software Foundation; either
 *  version 2 of the License, or (at your option) any later version.
 *
 *  This library is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  Library General Public License for more details.
 *
 *  You should have received a copy of the GNU Library General Public
 *  License along with this library; if not, write to the Free
 *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

/*  Nov 6, 2003  Initial version.
 *
[...1133 lines suppressed...]
					 * the end of the buffer is so that it can construct the
					 * group member ptr table. */
					((struct group *) data)->gr_name = line_buff + buflen;
				}

				if (!__parserfunc(data, line_buff)) {
					rv = 0;
					break;
				}
			}
		} while (1);

		__STDIO_THREADUNLOCK(f);
	}

	return rv;
}

#endif
/**********************************************************************/

--- __getgrent_r.c DELETED ---

--- putpwent.c DELETED ---

--- spent.c DELETED ---

--- getspnam.c DELETED ---

--- putspent.c DELETED ---

--- sgetspent.c DELETED ---

--- initgroups.c DELETED ---

--- getgrgid.c DELETED ---

--- fgetspent.c DELETED ---

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/libc/pwd_grp/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	18 Oct 2003 10:19:20 -0000	1.24
+++ Makefile	6 Nov 2003 20:56:03 -0000	1.25
@@ -24,17 +24,27 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
-CSRC= pwent.c getpwnam.c getpwuid.c putpwent.c getpw.c fgetpwent.c \
-	__getgrent_r.c grent.c getgrnam.c getgrgid.c fgetgrent.c \
-	initgroups.c __getpwent_r.c putgrent.c
+MSRC=pwd_grp.c
+MOBJ=	fgetpwent_r.o fgetgrent_r.o fgetpwent.o fgetgrent.o \
+	getpwnam_r.o getgrnam_r.o getpwuid_r.o getgrgid_r.o \
+	getpwuid.o getgrgid.o getpwnam.o getgrnam.o getpw.o \
+	getpwent_r.o getgrent_r.o getpwent.o getgrent.o \
+	initgroups.o putpwent.o putgrent.o \
+	__parsepwent.o __parsegrent.o __pgsreader.o
 
 ifeq ($(HAS_SHADOW),y)
-CSRC+= lckpwdf.c spent.c getspnam.c getspuid.c putspent.c sgetspent.c \
-	fgetspent.c __getspent_r.c __sgetspent_r.c
+MOBJ+=	fgetspent_r.o fgetspent.o sgetspent_r.o getspnam_r.o \
+	getspnam.o getspent_r.o getspent.o sgetspent.o \
+	putspent.o __parsespent.o # getspuid_r.o getspuid.o
 endif
 
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
+CSRC=
+ifeq ($(HAS_SHADOW),y)
+CSRC+= lckpwdf.c
+endif
+
+COBJ=$(patsubst %.c,%.o, $(CSRC))
+OBJS=$(MOBJ) $(COBJ)
 
 all: $(OBJS) $(LIBC)
 
@@ -43,7 +53,11 @@
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 
-$(COBJS): %.o : %.c
+$(MOBJ): $(MSRC)
+	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(COBJ): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 

--- __getspent_r.c DELETED ---

--- getgrnam.c DELETED ---

--- getpw.c DELETED ---

--- fgetpwent.c DELETED ---

--- putgrent.c DELETED ---

--- __sgetspent_r.c DELETED ---

--- config.h DELETED ---

--- getspuid.c DELETED ---

--- grent.c DELETED ---

--- fgetgrent.c DELETED ---

--- __getpwent_r.c DELETED ---

--- getpwnam.c DELETED ---




More information about the uClibc-cvs mailing list