Sort sections.

[pw-darwin.git] / pw / grupd.c

diff --git a/pw/grupd.c b/pw/grupd.c
index 725cf09edb4050fca584f4fd5a8d63968980dd74..edff76d1285c88dda81cd015850bffa215e1dafc 100644 (file)
--- a/pw/grupd.c
+++ b/pw/grupd.c
@@ -22,21 +22,60 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.

- *
- *     $Id: grupd.c,v 1.1.1.2 1996/12/10 23:58:56 joerg Exp $

  */
 
  */
 

+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>

-#include <errno.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <sys/param.h>

 
 #include "pwupd.h"
 
 
 #include "pwupd.h"
 

+static char * grpath = _PATH_PWD;
+
+int
+setgrdir(const char * dir)
+{
+       if (dir == NULL)
+               return -1;
+       else {
+               char * d = malloc(strlen(dir)+1);
+               if (d == NULL)
+                       return -1;
+               grpath = strcpy(d, dir);
+       }
+       return 0;
+}
+
+char *
+getgrpath(const char * file)
+{
+       static char pathbuf[MAXPATHLEN];
+
+       snprintf(pathbuf, sizeof pathbuf, "%s/%s", grpath, file);
+       return pathbuf;
+}
+
+int
+grdb(char *arg,...)
+{
+       /*
+        * This is a stub for now, but maybe eventually be functional
+        * if ever an indexed version of /etc/groups is implemented.
+        */
+       arg=arg;
+       return 0;
+}
+

 int
 fmtgrentry(char **buf, int * buflen, struct group * grp, int type)
 {
 int
 fmtgrentry(char **buf, int * buflen, struct group * grp, int type)
 {


@@ -94,7 +133,7 @@ gr_update(struct group * grp, char const * group, int mode)
        int             grbuflen = 0;
        char           *grbuf = NULL;
 
        int             grbuflen = 0;
        char           *grbuf = NULL;
 

-       endgrent();
+       ENDGRENT();

        l = snprintf(pfx, sizeof pfx, "%s:", group);
 
        /*
        l = snprintf(pfx, sizeof pfx, "%s:", group);
 
        /*


@@ -102,8 +141,11 @@ gr_update(struct group * grp, char const * group, int mode)
         */
        if (grp != NULL && fmtgrentry(&grbuf, &grbuflen, grp, PWF_PASSWD) == -1)
                l = -1;
         */
        if (grp != NULL && fmtgrentry(&grbuf, &grbuflen, grp, PWF_PASSWD) == -1)
                l = -1;

-       else
-               l = fileupdate(_PATH_GROUP, 0644, grbuf, pfx, l, mode);
+       else {
+               l = fileupdate(getgrpath(_GROUP), 0644, grbuf, pfx, l, mode);
+               if (l == 0)
+                       l = grdb(NULL);
+       }

        if (grbuf != NULL)
                free(grbuf);
        return l;
        if (grbuf != NULL)
                free(grbuf);
        return l;