From 2ecc6106d7a24bf613a6501979c77ff9500a1a93 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Fri, 15 Apr 2005 05:06:09 +0000
Subject: [PATCH] Fix bug if we don't have Joliet around.

---
 lib/iso9660/iso9660_fs.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index 662e1999..95c4e0ae 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660_fs.c,v 1.27 2005/03/03 13:47:59 rocky Exp $
+    $Id: iso9660_fs.c,v 1.28 2005/04/15 05:06:09 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -52,7 +52,7 @@
 
 #include <stdio.h>
 
-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.27 2005/03/03 13:47:59 rocky Exp $";
+static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.28 2005/04/15 05:06:09 rocky Exp $";
 
 /* Implementation of iso9660_t type */
 struct _iso9660_s {
@@ -828,11 +828,11 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
       }
       strncpy(p_stat->filename, rr_fname, i_rr_fname+1);
     } else {
-#ifdef HAVE_JOLIET
       if ('\0' == p_iso9660_dir->filename[0] && 1 == i_fname)
 	strcpy (p_stat->filename, ".");
       else if ('\1' == p_iso9660_dir->filename[0] && 1 == i_fname)
 	strcpy (p_stat->filename, "..");
+#ifdef HAVE_JOLIET
       else if (i_joliet_level) {
 	int i_inlen = i_fname;
 	int i_outlen = (i_inlen / 2);
@@ -841,9 +841,9 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
 			 i_outlen);
 	strncpy(p_stat->filename, p_psz_out, i_fname);
 	free(p_psz_out);
-      } else
+      }
 #endif /*HAVE_JOLIET*/
-      {
+      else {
 	strncpy (p_stat->filename, p_iso9660_dir->filename, i_fname);
       }
     }