[src/trunk]: src/tests/fs Add test case for /->: conversion from PR kern/4452...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07aa91740859
branches:  trunk
changeset: 762256:07aa91740859
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Feb 18 13:07:54 2011 +0000

description:
Add test case for /->: conversion from PR kern/44523 by
Taylor R Campbell.

I adjusted the test to uudecode + bunzip2 the supplied image, and
removed the "null-finder" from the dirent code, since it had an
off-by-one which made the test fail.

diffstat:

 tests/fs/Makefile              |   4 +-
 tests/fs/hfs/Makefile          |  15 +++++++
 tests/fs/hfs/colon.hfs.bz2.uue |  35 +++++++++++++++++
 tests/fs/hfs/t_pathconvert.c   |  83 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 2 deletions(-)

diffs (163 lines):

diff -r a122f378c409 -r 07aa91740859 tests/fs/Makefile
--- a/tests/fs/Makefile Fri Feb 18 13:04:52 2011 +0000
+++ b/tests/fs/Makefile Fri Feb 18 13:07:54 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/08/01 08:32:17 pooka Exp $
+# $NetBSD: Makefile,v 1.20 2011/02/18 13:07:54 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 
 SUBDIR+=       common .WAIT
 
-TESTS_SUBDIRS+=        ffs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs
+TESTS_SUBDIRS+=        ffs hfs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs
 TESTS_SUBDIRS+=        tmpfs umapfs union
 TESTS_SUBDIRS+=        vfs
 
diff -r a122f378c409 -r 07aa91740859 tests/fs/hfs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/hfs/Makefile     Fri Feb 18 13:07:54 2011 +0000
@@ -0,0 +1,15 @@
+#      $NetBSD: Makefile,v 1.1 2011/02/18 13:07:54 pooka Exp $
+#
+
+TESTSDIR=      ${TESTSBASE}/fs/hfs
+
+TESTS_C=       t_pathconvert
+
+FILES=         colon.hfs.bz2.uue
+FILESDIR=      ${TESTSDIR}
+
+LDADD+=        -lrumpfs_hfs                                            # fs drivers
+LDADD+=        -lrumpdev_disk -lrumpdev                                # disk drivers
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+
+.include <bsd.test.mk>
diff -r a122f378c409 -r 07aa91740859 tests/fs/hfs/colon.hfs.bz2.uue
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/hfs/colon.hfs.bz2.uue    Fri Feb 18 13:07:54 2011 +0000
@@ -0,0 +1,35 @@
+begin 644 colon.hfs.bz2
+M0EIH.3%!629363%?)5P``$+____[_UOQ>_]__^_O\+____1K30045,CBA$'P
+M'DA:2!KIT`3V\VRA*<ZPAUVK`E%-)E,IME3T33U--DFRCU,T33T@]-1HQ&1M
+M(/2&@&TGI&@9#1B#0&F@TT:``R9/4$I$4PTF$Q,B8T)IY(VD:9&`3(80T>B&
+M`$,"8C$P$T9!HR:81B,":`D20A3T:GI`9``#(>H-`:-```:`````````````
+M08!#1B:`R:83)ID`&$:-,`F`)A!H9`Q,@#``"8F3`3`30%241HC(4_4GJ>U-
+M1Y31IM)ID`]3(T>H`#0#0T`:!H!A&@!H`````*9A\>L.>@+P;@Y:4C2%YM29
+M)Z`H>8SU&'"0U30JHOQ^.'A/7!GQK%#<GT'!B0OU+G:^>A5RVH"2$4VDL&T@
+M65#T*A/GU+(_VI$+*$`TJ"4J1(B1S&-YV+\J^"\Z6EK+@TU[0OQJ+;*HW.MN
+M=HTL,CQHCE$C3#EW'>#8!IGYY[*)]U$!0W6L;#U:*4X6IT<@^*5!16E)%(:*
+MA["$B&JX1022R8T4#20D@+ZHA_2_9$72HDSJ-FJ"7Z15%U2`@<>BJGD5'+*A
+M@M6>?K^MS^LOC8I)EI6[`O3`#CCKU:M6F6A00-$/:LH+!E7(G33<)<I*5Q&T
+M4[$M.$5OJZQKO59^7&LNANB-1PEMLB*TT\<[=;@7C@EYFG#:K@GL&R8^48"Y
+MU*QN%C56,Q?,.BW;"R9.7;9Z;2,+07U,QGK13C,!FYO^3/?)>)OZ27I4`@;=
+M4C<-$,N=UX98G_0DK)BTS-^)R+8NZ,B3JU:@85&-MM@</$$"."U>FCNQW/?=
+M'ZL4BR[\&3S\>.K"S#1Z&>2I>^+16EM54PV3%K7M$"E`.N2"E*,8-@V.E<3$
+M,K\RU$&5E//5.'K6A+44]9=\"WF$J@Q1!43!WLA!?"XLR2GOU6G-,W]92)1`
+MC@M4A4'FVAA`Q&&_%1B@L_`Z;T`0>[W6SCI%W&=H%Y>2"#E>IN[R<S>3+(:S
+MLMC<>N$1&APB(&6_#U<"!5*#IDA;MLNX`J(:/B8I,UNWB3CDPU2.@"(ORCKK
+MK(1*"RZ+9V>$I2"PLER`U4BFIY'VTJ#\NYN2-9DRCIP1([QBLNKT:%1K"-P5
+MY)2NL9KM8=ACP>MLBS&J(00HA*QYRUL:'A%8F5]&22@@@D,;3[C,4.9$P)DK
+M>\N+DK'4TLDI*LD&>8DE<M`B3!)=Z,E/#BSM)O*_$9Z"ZPSI%3*/=47CG8DJ
+MD]U*[RTUH7SC41(FD1>V@DT9B\,_CR;`,Y-E8*MM?Z*?BPU`I[I5^G-B$$A.
+M\7&8DC*:*',@VKX0HL8O)DL<-9GG!8>NK.2XS2I.;Z3%Q9OIL8?(6-*DEGHW
+MX^&A?%APXI:C@,A/&<6=)7#$UI;1Y6A'C<#/EW-*T(8WC9=`B`%\)M5HIS[\
+MV1%+H,,()X19<,:)U:Y?V\-T!^]'A\%%%+Z6.PQ"QI$]3#11IRB<#.9-L)^!
+MB-WJYVQVMP^;7V<DK?-[M;DQF]<[:M3)$-F@*(CXT128KESC.#OPP+`$D`G-
+MA6$DKT2V\;3+*:U+2]66T]'1$A`=33.FMDA1G\MA$1V_"/+2]%!GTQI'8E03
+M=?AO,S0#0V,9IS,&;8KGKL_$RKJFE62392;]B2933`4\$VJ""-0$;")-/A]R
+M[D"*/0:F1=%1R!B9&8=^RD4B^;4O-6'*J4J)EVNWN[+!_$)1\;@+#>*W5MG'
+MKUWYE^[,*T:U)Y]NUI,00H%8>74G/?LJ0K)51^BXZ+AI*2O[PI`V*%Q@X\YV
+M!V?D08"^;*TYO4R)T6G5:M;_M5M*;H4V)1IKCL$01$`#1R%N5,'_B[DBG"A(
+%&*^2K@"^
+`
+end
diff -r a122f378c409 -r 07aa91740859 tests/fs/hfs/t_pathconvert.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/hfs/t_pathconvert.c      Fri Feb 18 13:07:54 2011 +0000
@@ -0,0 +1,83 @@
+/*     $NetBSD: t_pathconvert.c,v 1.1 2011/02/18 13:07:54 pooka Exp $  */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/hfs/hfs.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(colonslash);
+ATF_TC_HEAD(colonslash, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "HFS+ colons/slashes (PR kern/44523)");
+       atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+#define IMGNAME "colon.hfs"
+#define FAKEBLK "/dev/blk"
+#define FUNNY_FILENAME "foo:bar"
+ATF_TC_BODY(colonslash, tc)
+{
+       struct hfs_args args;
+       int dirfd, fd;
+       char thecmd[1024];
+       char buf[DIRBLKSIZ];
+       struct dirent *dirent;
+       int offset, nbytes;
+       bool ok = false;
+
+       snprintf(thecmd, sizeof(thecmd), "uudecode %s/colon.hfs.bz2.uue",
+           atf_tc_get_config_var(tc, "srcdir"));
+       RZ(system(thecmd));
+
+       snprintf(thecmd, sizeof(thecmd), "bunzip2 " IMGNAME ".bz2");
+       RZ(system(thecmd));
+
+       memset(&args, 0, sizeof args);
+       args.fspec = __UNCONST(FAKEBLK);
+       RZ(rump_init());
+
+       RL(rump_sys_mkdir("/mp", 0777));
+       RZ(rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK));
+       RL(rump_sys_mount(MOUNT_HFS, "/mp", 0, &args, sizeof args));
+
+       RL(dirfd = rump_sys_open("/mp", O_RDONLY));
+
+       RL(nbytes = rump_sys_getdents(dirfd, buf, sizeof buf));
+
+       for (offset = 0; offset < nbytes; offset += dirent->d_reclen) {
+               dirent = (struct dirent *)(buf + offset);
+               if (strchr(dirent->d_name, '/'))
+                       atf_tc_fail("dirent with slash: %s", dirent->d_name);
+               if (0 == strcmp(FUNNY_FILENAME, dirent->d_name))
+                       ok = true;
+       }
+
+       if (!ok)
+               atf_tc_fail("no dirent for file: %s", FUNNY_FILENAME);
+
+       RL(rump_sys_close(dirfd));
+       RL(fd = rump_sys_open("/mp/" FUNNY_FILENAME, O_RDONLY));
+       RL(rump_sys_close(fd));
+       RL(rump_sys_unmount("/mp", 0));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+       ATF_TP_ADD_TC(tp, colonslash);
+       return 0;
+}