Author: colossus
Date: 2006-08-01 10:22:30 +0000 (Tue, 01 Aug 2006)
New Revision: 22602
Modified:
xarchiver/trunk/src/Makefile.am
xarchiver/trunk/src/iso.c
xarchiver/trunk/src/main.c
Log:
Fixed bad display of subdirectory inside ISO images. Thanks to Salvatore
Santagati for fixing this.
Modified: xarchiver/trunk/src/Makefile.am
===================================================================
--- xarchiver/trunk/src/Makefile.am 2006-08-01 08:46:39 UTC (rev 22601)
+++ xarchiver/trunk/src/Makefile.am 2006-08-01 10:22:30 UTC (rev 22602)
@@ -17,6 +17,7 @@
iso.c iso.h \
extract_dialog.c extract_dialog.h \
add_dialog.c add_dialog.h
+# new_dialog.c new_dialog.h
xarchiver_CFLAGS = \
@GTK_CFLAGS@ \
Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c 2006-08-01 08:46:39 UTC (rev 22601)
+++ xarchiver/trunk/src/iso.c 2006-08-01 10:22:30 UTC (rev 22602)
@@ -38,7 +38,6 @@
struct todo * todo_idr = NULL;
-char *rootname = "/";
char name_buf[256];
struct stat fstat_buf;
@@ -450,19 +449,19 @@
td->next = NULL;
td->extent = iso_733((unsigned char
*)idr->extent);
td->length = iso_733((unsigned char
*)idr->size);
- td->name = (char *) malloc(strlen(rootname) +
strlen(name_buf) + 2);
- strcpy(td->name, rootname);
+ td->name = (char *) malloc(strlen(dir_name) +
strlen(name_buf) + 2);
+ strcpy(td->name, dir_name);
strcat(td->name, name_buf);
strcat(td->name, "/");
}
else
{
- strcpy(testname, rootname);
+ strcpy(testname, dir_name);
strcat(testname, name_buf);
}
if( do_find && (idr->name_len[0] != 1 || (idr->name[0]
!= 0 && idr->name[0] != 1)))
{
- strcpy(testname, rootname);
+ strcpy(testname, dir_name);
strcat(testname, name_buf);
}
dump_stat(dir_name , iso_733((unsigned char
*)idr->extent), archive);
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2006-08-01 08:46:39 UTC (rev 22601)
+++ xarchiver/trunk/src/main.c 2006-08-01 10:22:30 UTC (rev 22602)
@@ -243,10 +243,6 @@
}
}
-/* TODO: Support to load the configuration of Xarchiver when extract and add
will allow set own archiver's options
-g_get_home_dir ()
-*/
-
void GetAvailableCompressors()
{
absolute_path = g_find_program_in_path("bzip2");
@@ -267,10 +263,7 @@
/* In future releases of xarchiver we'll use mkisofs to allow creation
of iso images
if ( g_find_program_in_path("mkisofs"))
- {
- ArchiveType = g_list_prepend ( ArchiveType, ".iso");
- ArchiveSuffix = g_list_prepend ( ArchiveSuffix, "*.iso");
- }
+ //Allow creation of ISO images
*/
ArchiveType = g_list_prepend ( ArchiveType, ".iso");
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
