X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_xfs.c;h=789106871aa388d246a784e87e1eeb38def8314f;hp=1bfadba0070d7fe7129de3574b8436ead05f636a;hb=94b9f91a346ceed386faf284ad2e549922a1a385;hpb=b58b7f84f40f96f61a1d5fc1f88a1abd9c1a4193

diff --git a/second/fs_xfs.c b/second/fs_xfs.c
index 1bfadba..7891068 100644
--- a/second/fs_xfs.c
+++ b/second/fs_xfs.c
@@ -30,6 +30,7 @@
 #include "xfs/xfs.h"
 #include "errors.h"
 #include "debug.h"
+#include "bootinfo.h"
 
 #define SECTOR_BITS 9
 
@@ -38,8 +39,8 @@ int xfs_read_data (char *buf, int len);
 int xfs_dir (char *dirname);
 
 /* Exported in struct fs_t */
-static int xfs_open(struct boot_file_t *file, const char *dev_name,
-		    struct partition_t *part, const char *file_name);
+static int xfs_open(struct boot_file_t *file,
+		    struct partition_t *part, struct boot_fspec_t *fspec);
 static int xfs_read(struct boot_file_t *file, unsigned int size, void *buffer);
 static int xfs_seek(struct boot_file_t *file, unsigned int newpos);
 static int xfs_close(struct boot_file_t *file);
@@ -58,8 +59,8 @@ uint64_t partition_offset;
 int errnum;
 
 static int
-xfs_open(struct boot_file_t *file, const char *dev_name,
-	 struct partition_t *part, const char *file_name)
+xfs_open(struct boot_file_t *file,
+	 struct partition_t *part, struct boot_fspec_t *fspec)
 {
 	static char buffer[1024];
 
@@ -77,9 +78,11 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 	else
 		partition_offset = 0;
 
-	sprintf(buffer, "%s:%d", dev_name, 0); /* 0 is full disk in OF */
+	strncpy(buffer, fspec->dev, 1020);
+	if (_machine != _MACH_bplan)
+		strcat(buffer, ":0");  /* 0 is full disk in (non-buggy) OF */
 	DEBUG_F("Trying to open dev_name=%s; filename=%s; partition offset=%Lu\n",
-		buffer, file_name, partition_offset);
+		buffer, fspec->file, partition_offset);
 	file->of_device = prom_open(buffer);
 
 	if (file->of_device == PROM_INVALID_HANDLE || file->of_device == NULL)
@@ -92,7 +95,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 	DEBUG_F("%p was successfully opened\n", file->of_device);
 
 	xfs_file = file;
-    
+
 	if (xfs_mount() != 1)
 	{
 		DEBUG_F("Couldn't open XFS @ %s/%Lu\n", buffer, partition_offset);
@@ -102,8 +105,8 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 		return FILE_ERR_BAD_FSYS;
 	}
 
-	DEBUG_F("Attempting to open %s\n", file_name);
-	strcpy(buffer, file_name); /* xfs_dir modifies argument */
+	DEBUG_F("Attempting to open %s\n", fspec->file);
+	strcpy(buffer, fspec->file); /* xfs_dir modifies argument */
 	if(!xfs_dir(buffer))
 	{
 		DEBUG_F("xfs_dir() failed. errnum = %d\n", errnum);
@@ -113,7 +116,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 		return errnum;
 	}
 
-	DEBUG_F("Successfully opened %s\n", file_name);
+	DEBUG_F("Successfully opened %s\n", fspec->file);
 
 	DEBUG_LEAVE(FILE_ERR_OK);
 	return FILE_ERR_OK;
@@ -241,7 +244,7 @@ ino2offset (xfs_ino_t ino)
 static xfs_fsblock_t
 xt_start (xfs_bmbt_rec_32_t *r)
 {
-	return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) | 
+	return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) |
 	       (((xfs_fsblock_t)le32 (r->l2)) << 11) |
 	       (((xfs_fsblock_t)le32 (r->l3)) >> 21);
 }
@@ -487,7 +490,7 @@ next_dentry (xfs_ino_t *ino)
 	int toread;
 	static char *usual[2] = {".", ".."};
 	static xfs_dir2_sf_entry_t *sfe;
-	char *name = usual[0];
+	unsigned char *name = (unsigned char *)usual[0];
 
 	if (xfs.dirpos >= xfs.dirmax) {
 		if (xfs.forw == 0)
@@ -512,7 +515,7 @@ next_dentry (xfs_ino_t *ino)
 			++name;
 			++namelen;
 			sfe = (xfs_dir2_sf_entry_t *)
-				(inode->di_u.di_c 
+				(inode->di_u.di_c
 				 + sizeof(xfs_dir2_sf_hdr_t)
 				 - xfs.i8param);
 			break;
@@ -549,14 +552,14 @@ next_dentry (xfs_ino_t *ino)
 #undef dau
 		toread = roundup8 (namelen + 11) - 9;
 		xfs_read_data (dirbuf, toread);
-		name = (char *)dirbuf;
+		name = (unsigned char *)dirbuf;
 		xfs.blkoff += toread + 5;
 		break;
 	}
 	++xfs.dirpos;
 	name[namelen] = 0;
 
-	return name;
+	return (char *)name;
 }
 
 static char *
@@ -666,7 +669,7 @@ xfs_read_data (char *buf, int len)
 		offset = xad->offset;
 		xadlen = xad->len;
 		if (isinxt (xfs_file->pos >> xfs.blklog, offset, xadlen)) {
-			endofcur = (offset + xadlen) << xfs.blklog; 
+			endofcur = (offset + xadlen) << xfs.blklog;
 			toread = (endofcur >= endpos)
 				  ? len : (endofcur - xfs_file->pos);
 			read_disk_block(xfs_file, fsb2daddr (xad->start),
@@ -684,7 +687,7 @@ xfs_read_data (char *buf, int len)
 			}
 			continue;
 		}
-		endofprev = offset + xadlen; 
+		endofprev = offset + xadlen;
 	}
 
 	return xfs_file->pos - startpos;
@@ -778,7 +781,7 @@ xfs_dir (char *dirname)
 	}
 }
 
-/* 
+/*
  * Local variables:
  * c-file-style: "k&r"
  * c-basic-offset: 8