patch-1.3.60 linux/fs/msdos/dir.c

Next file: linux/fs/msdos/fat.c
Previous file: linux/fs/msdos/buffer.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.59/linux/fs/msdos/dir.c linux/fs/msdos/dir.c
@@ -1,135 +0,0 @@
-/*
- *  linux/fs/msdos/dir.c
- *  MS-DOS directory handling functions
- *
- *  Written 1992,1993 by Werner Almesberger
- *
- *  Hidden files 1995 by Albert Cahalan <albert@ccs.neu.edu> <adc@coe.neu.edu>
- */
-
-#include <linux/fs.h>
-#include <linux/msdos_fs.h>
-#include <linux/errno.h>
-#include <linux/stat.h>
-#include <linux/string.h>
-
-#include <asm/segment.h>
-
-#include "msbuffer.h"
-
-
-#define PRINTK(X)
-
-static int msdos_dir_read(struct inode * inode,struct file * filp, char * buf,int count)
-{
-	return -EISDIR;
-}
-
-static struct file_operations msdos_dir_operations = {
-	NULL,			/* lseek - default */
-	msdos_dir_read,		/* read */
-	NULL,			/* write - bad */
-	msdos_readdir,		/* readdir */
-	NULL,			/* select - default */
-	NULL,			/* ioctl - default */
-	NULL,			/* mmap */
-	NULL,			/* no special open code */
-	NULL,			/* no special release code */
-	file_fsync		/* fsync */
-};
-
-struct inode_operations msdos_dir_inode_operations = {
-	&msdos_dir_operations,	/* default directory file-ops */
-	msdos_create,		/* create */
-	msdos_lookup,		/* lookup */
-	NULL,			/* link */
-	msdos_unlink,		/* unlink */
-	NULL,			/* symlink */
-	msdos_mkdir,		/* mkdir */
-	msdos_rmdir,		/* rmdir */
-	NULL,			/* mknod */
-	msdos_rename,		/* rename */
-	NULL,			/* readlink */
-	NULL,			/* follow_link */
-	NULL,			/* readpage */
-	NULL,			/* writepage */
-	msdos_bmap,		/* bmap */
-	NULL,			/* truncate */
-	NULL			/* permission */
-};
-
-int msdos_readdir(
-	struct inode *inode,
-	struct file *filp,
-	void *dirent,
-	filldir_t filldir)
-{
-	struct super_block *sb = inode->i_sb;
-	int ino,i,i2,last;
-	char c;
-	struct buffer_head *bh;
-	struct msdos_dir_entry *de;
-	unsigned long oldpos = filp->f_pos;
-
-	if (!inode || !S_ISDIR(inode->i_mode))
-		return -EBADF;
-/* Fake . and .. for the root directory. */
-	if (inode->i_ino == MSDOS_ROOT_INO) {
-		while (oldpos < 2) {
-			if (filldir(dirent, "..", oldpos+1, oldpos, MSDOS_ROOT_INO) < 0)
-				return 0;
-			oldpos++;
-			filp->f_pos++;
-		}
-		if (oldpos == 2)
-			filp->f_pos = 0;
-	}
-	if (filp->f_pos & (sizeof(struct msdos_dir_entry)-1))
-		return -ENOENT;
-	bh = NULL;
-	while ((ino = msdos_get_entry(inode,&filp->f_pos,&bh,&de)) > -1) {
-		if (!IS_FREE(de->name) && !(de->attr & ATTR_VOLUME)) {
-			char bufname[13];
-			char *ptname = bufname;
-			int dotoffset = 0;
-			if ((de->attr & ATTR_HIDDEN) && MSDOS_SB(sb)->dotsOK) {
-				bufname[0] = '.';
-				dotoffset = 1;
-				ptname = bufname+1;
-			}
-			for (i = last = 0; i < 8; i++) {
-				if (!(c = de->name[i])) break;
-				if (c >= 'A' && c <= 'Z') c += 32;
-				/* see namei.c, msdos_format_name */
-				if (c == 0x05) c = 0xE5;
-				if (c != ' ')
-					last = i+1;
-				ptname[i] = c;
-			}
-			i = last;
-			ptname[i] = '.';
-			i++;
-			for (i2 = 0; i2 < 3; i2++) {
-				if (!(c = de->ext[i2])) break;
-				if (c >= 'A' && c <= 'Z') c += 32;
-				if (c != ' ')
-					last = i+1;
-				ptname[i] = c;
-				i++;
-			}
-			if ((i = last) != 0) {
-				if (!strcmp(de->name,MSDOS_DOT))
-					ino = inode->i_ino;
-				else if (!strcmp(de->name,MSDOS_DOTDOT))
-					ino = msdos_parent_ino(inode,0);
-				if (filldir(dirent, bufname, i+dotoffset, oldpos, ino) < 0) {
-					filp->f_pos = oldpos;
-					break;
-				}
-			}
-		}
-		oldpos = filp->f_pos;
-	}
-	if (bh) brelse(bh);
-	return 0;
-}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this