mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* misc/tst-mntent.c: Add test case for addmntent and getmntent.
This commit is contained in:
Ulrich Drepper 1999-07-26 01:47:15 +00:00
parent b0b422e85d
commit 63f7cb448b
3 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* misc/mntent_r.c: Allow spaces and tabs in entry names by
encoding these characters.
* misc/tst-mntent.c: Add test case for addmntent and getmntent.
* string/bits/string2.h: Fix aliasing problems.
* sysdeps/i386/i486/bits/string.h: Likewise.

8
misc/mntent_r.c
View File

@ -162,14 +162,18 @@ weak_alias (__getmntent_r, getmntent_r)
while (*rp != '\0') \
if (*rp == ' ' || *rp == '\t' || *rp == '\\') \
break; \
else \
++rp; \
\
if (*rp != '\0') \
{ \
/* In the worst case the length of the string can increase to \
founr times the current length. */ \
char *wp = (char *) alloca (strlen (name) * 4 + 1); \
char *wp; \
\
rp = name; \
name = wp = (char *) alloca (strlen (name) * 4 + 1); \
\
do \
if (*rp == ' ') \
{ \
@ -193,8 +197,6 @@ weak_alias (__getmntent_r, getmntent_r)
else \
*wp++ = *rp; \
while (*rp++ != '\0'); \
\
name = wp; \
} \
} while (0)

59
misc/tst-mntent.c
View File

@ -1,4 +1,5 @@
/* Test case by Horst von Brand <vonbrand@sleipnir.valparaiso.cl>. */
/* Test case by Horst von Brand <vonbrand@sleipnir.valparaiso.cl>
and Ulrich Drepper <drepper@cygnus.com>. */
#include <mntent.h>
#include <stdio.h>
#include <string.h>
@ -10,13 +11,15 @@ main (int argc, char *argv[])
int result = 0;
struct mntent mef;
struct mntent *mnt = &mef;
char *name;
FILE *fp;
mef.mnt_fsname = strdupa ("/dev/hda1");
mef.mnt_dir = strdupa ("/");
mef.mnt_dir = strdupa ("/some dir");
mef.mnt_type = strdupa ("ext2");
mef.mnt_opts = strdupa ("defaults");
mef.mnt_freq = 1;
mef.mnt_passno = 1;
mef.mnt_passno = 2;
if (hasmntopt (mnt, "defaults"))
printf ("Found!\n");
@ -26,5 +29,55 @@ main (int argc, char *argv[])
result = 1;
}
name = tmpnam (NULL);
fp = fopen (name, "w+");
if (fp == NULL)
{
printf ("Cannot open temporary file: %m\n");
result = 1;
}
else
{
char buf[1024];
/* Write the name entry. */
addmntent (fp, &mef);
/* Prepare for reading. */
rewind (fp);
/* First, read it raw. */
if (fgets (buf, sizeof (buf), fp) == NULL)
{
printf ("Cannot read temporary file: %m");
result = 1;
}
else
if (strcmp (buf, "/dev/hda1 /some\\040dir ext2 defaults 1 2\n") != 0)
{
puts ("Raw file data not correct");
result = 1;
}
/* Prepare for reading, part II. */
rewind (fp);
/* Now read it cooked. */
mnt = getmntent (fp);
if (strcmp (mnt->mnt_fsname, "/dev/hda1") != 0
|| strcmp (mnt->mnt_dir, "/some dir") != 0
|| strcmp (mnt->mnt_type, "ext2") != 0
|| strcmp (mnt->mnt_opts, "defaults") != 0
|| mnt->mnt_freq != 1
|| mnt->mnt_passno != 2)
{
puts ("Error while reading written entry back in");
result = 1;
}
remove (name);
}
return result;
}