This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / sys / isofs / isofs_vnops.c

diff --git a/sys/isofs/isofs_vnops.c b/sys/isofs/isofs_vnops.c
index 8e40b05..86ba250 100644 (file)
--- a/sys/isofs/isofs_vnops.c
+++ b/sys/isofs/isofs_vnops.c
@@ -1,5 +1,5 @@
 /*
 /*

- *     $Id: isofs_vnops.c,v 1.5 1993/07/19 13:40:10 cgd Exp $
+ *     $Id: isofs_vnops.c,v 1.3 1993/11/25 01:32:31 wollman Exp $

  */
 #include "param.h"
 #include "systm.h"
  */
 #include "param.h"
 #include "systm.h"


@@ -28,6 +28,7 @@
  * Nothing to do.
  */
 /* ARGSUSED */
  * Nothing to do.
  */
 /* ARGSUSED */

+int

 isofs_open(vp, mode, cred, p)
        struct vnode *vp;
        int mode;
 isofs_open(vp, mode, cred, p)
        struct vnode *vp;
        int mode;


@@ -43,6 +44,7 @@ isofs_open(vp, mode, cred, p)
  * Update the times on the inode on writeable file systems.
  */
 /* ARGSUSED */
  * Update the times on the inode on writeable file systems.
  */
 /* ARGSUSED */

+int

 isofs_close(vp, fflag, cred, p)
        struct vnode *vp;
        int fflag;
 isofs_close(vp, fflag, cred, p)
        struct vnode *vp;
        int fflag;


@@ -57,6 +59,7 @@ isofs_close(vp, fflag, cred, p)
  * The mode is shifted to select the owner/group/other fields. The
  * super user is granted all permissions.
  */
  * The mode is shifted to select the owner/group/other fields. The
  * super user is granted all permissions.
  */

+int

 isofs_access(vp, mode, cred, p)
        struct vnode *vp;
        register int mode;
 isofs_access(vp, mode, cred, p)
        struct vnode *vp;
        register int mode;


@@ -67,6 +70,7 @@ isofs_access(vp, mode, cred, p)
 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

+int

 isofs_getattr(vp, vap, cred, p)
        struct vnode *vp;
        register struct vattr *vap;
 isofs_getattr(vp, vap, cred, p)
        struct vnode *vp;
        register struct vattr *vap;


@@ -106,6 +110,7 @@ isofs_getattr(vp, vap, cred, p)
  * Vnode op for reading.
  */
 /* ARGSUSED */
  * Vnode op for reading.
  */
 /* ARGSUSED */

+int

 isofs_read(vp, uio, ioflag, cred)
        struct vnode *vp;
        register struct uio *uio;
 isofs_read(vp, uio, ioflag, cred)
        struct vnode *vp;
        register struct uio *uio;


@@ -165,6 +170,7 @@ isofs_read(vp, uio, ioflag, cred)
 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

+int

 isofs_ioctl(vp, com, data, fflag, cred, p)
        struct vnode *vp;
        int com;
 isofs_ioctl(vp, com, data, fflag, cred, p)
        struct vnode *vp;
        int com;


@@ -177,6 +183,7 @@ isofs_ioctl(vp, com, data, fflag, cred, p)
 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

+int

 isofs_select(vp, which, fflags, cred, p)
        struct vnode *vp;
        int which, fflags;
 isofs_select(vp, which, fflags, cred, p)
        struct vnode *vp;
        int which, fflags;


@@ -196,6 +203,7 @@ isofs_select(vp, which, fflags, cred, p)
  * NB Currently unsupported.
  */
 /* ARGSUSED */
  * NB Currently unsupported.
  */
 /* ARGSUSED */

+int

 isofs_mmap(vp, fflags, cred, p)
        struct vnode *vp;
        int fflags;
 isofs_mmap(vp, fflags, cred, p)
        struct vnode *vp;
        int fflags;


@@ -212,6 +220,7 @@ isofs_mmap(vp, fflags, cred, p)
  * Nothing to do, so just return.
  */
 /* ARGSUSED */
  * Nothing to do, so just return.
  */
 /* ARGSUSED */

+int

 isofs_seek(vp, oldoff, newoff, cred)
        struct vnode *vp;
        off_t oldoff, newoff;
 isofs_seek(vp, oldoff, newoff, cred)
        struct vnode *vp;
        off_t oldoff, newoff;


@@ -224,6 +233,7 @@ isofs_seek(vp, oldoff, newoff, cred)
 /*
  * Vnode op for readdir
  */
 /*
  * Vnode op for readdir
  */

+int

 isofs_readdir(vp, uio, cred, eofflagp)
        struct vnode *vp;
        register struct uio *uio;
 isofs_readdir(vp, uio, cred, eofflagp)
        struct vnode *vp;
        register struct uio *uio;


@@ -307,27 +317,32 @@ isofs_readdir(vp, uio, cred, eofflagp)
                 *
                 */
                switch (ep->name[0]) {
                 *
                 */
                switch (ep->name[0]) {

-                       case 0:
-                               dirent.d_name[0] = '.';
-                               dirent.d_namlen = 1;
+               case 0:
+                       dirent.d_name[0] = '.';
+                       dirent.d_namlen = 1;
+                       break;
+               case 1:
+                       dirent.d_name[0] = '.';
+                       dirent.d_name[1] = '.';
+                       dirent.d_namlen = 2;
+                       break;
+               default:
+                       switch ( imp->iso_ftype ) {
+                       case ISO_FTYPE_RRIP:
+                               isofs_rrip_getname( ep, dirent.d_name, &dirent.d_namlen );

                                break;
                                break;

-                       case 1:
-                               dirent.d_name[0] = '.';
-                               dirent.d_name[1] = '.';
-                               dirent.d_namlen = 2;
+                       case ISO_FTYPE_9660:
+                       {
+                               int namelen = dirent.d_namlen;
+                               isofntrans(ep->name, dirent.d_namlen,
+                                          dirent.d_name, &namelen);
+                               dirent.d_namlen = namelen;

                                break;
                                break;

+                       }

                        default:
                        default:

-                               switch ( imp->iso_ftype ) {
-                                       case ISO_FTYPE_RRIP:
-                                               isofs_rrip_getname( ep, dirent.d_name, &dirent.d_namlen );
-                                       break;
-                                       case ISO_FTYPE_9660:
-                                               isofntrans(ep->name, dirent.d_namlen, dirent.d_name, &dirent.d_namlen);
-                                       break;
-                                       default:
-                                       break;
-                               }

                                break;
                                break;

+                       }
+                       break;

                }
 
                dirent.d_name[dirent.d_namlen] = 0;
                }
 
                dirent.d_name[dirent.d_namlen] = 0;


@@ -446,6 +461,7 @@ struct ucred *cred;
  * done. If a buffer has been saved in anticipation of a CREATE, delete it.
  */
 /* ARGSUSED */
  * done. If a buffer has been saved in anticipation of a CREATE, delete it.
  */
 /* ARGSUSED */

+int

 isofs_abortop(ndp)
        struct nameidata *ndp;
 {
 isofs_abortop(ndp)
        struct nameidata *ndp;
 {


@@ -458,6 +474,7 @@ isofs_abortop(ndp)
 /*
  * Lock an inode.
  */
 /*
  * Lock an inode.
  */

+int

 isofs_lock(vp)
        struct vnode *vp;
 {
 isofs_lock(vp)
        struct vnode *vp;
 {


@@ -470,6 +487,7 @@ isofs_lock(vp)
 /*
  * Unlock an inode.
  */
 /*
  * Unlock an inode.
  */

+int

 isofs_unlock(vp)
        struct vnode *vp;
 {
 isofs_unlock(vp)
        struct vnode *vp;
 {


@@ -484,6 +502,7 @@ isofs_unlock(vp)
 /*
  * Check for a locked inode.
  */
 /*
  * Check for a locked inode.
  */

+int

 isofs_islocked(vp)
        struct vnode *vp;
 {
 isofs_islocked(vp)
        struct vnode *vp;
 {


@@ -498,6 +517,7 @@ isofs_islocked(vp)
  * then call the device strategy routine.
  */
 
  * then call the device strategy routine.
  */
 

+int

 isofs_strategy(bp)
        register struct buf *bp;
 {
 isofs_strategy(bp)
        register struct buf *bp;
 {


@@ -526,6 +546,7 @@ isofs_strategy(bp)
 /*
  * Print out the contents of an inode.
  */
 /*
  * Print out the contents of an inode.
  */

+void

 isofs_print(vp)
        struct vnode *vp;
 {
 isofs_print(vp)
        struct vnode *vp;
 {