X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Fclient%2Fcmdline%2Ffile_info.c;h=f3fc34246e2e6c9d34fef6795ab5ab77bb4e1b41;hb=21dea5024c2fba9bcbe080dbd917dd27562c1190;hp=23b0cd455dbd301ec78c39620fef7cb6a8ff7b27;hpb=efac05db0f4c7eb5ec19d711a109338bd177bb74;p=captive.git

diff --git a/src/client/cmdline/file_info.c b/src/client/cmdline/file_info.c
index 23b0cd4..f3fc342 100644
--- a/src/client/cmdline/file_info.c
+++ b/src/client/cmdline/file_info.c
@@ -28,6 +28,7 @@
 
 
 #include "file_info.h"	/* self */
+#include "utf8.h"
 
 
 GQuark cmdline_file_info_error_quark(void)
@@ -41,47 +42,61 @@ GQuark r=0;
 }
 
 
-void file_info_dump_line(const GnomeVFSFileInfo *file_info,GError **errp)
+void cmdline_captive_file_info_object_dump_line(CaptiveFileInfoObject *captive_file_info_object,GError **errp)
 {
 const gchar *file_type,*file_perms;
 gchar *file_size;
 
+	g_return_if_fail(CAPTIVE_FILE_INFO_IS_OBJECT(captive_file_info_object));
 	g_return_if_fail(!errp || !*errp);
 
-	switch (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ? GNOME_VFS_FILE_TYPE_UNKNOWN : file_info->type) {
+	switch (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ? GNOME_VFS_FILE_TYPE_UNKNOWN : captive_file_info_object->p.type) {
 		case GNOME_VFS_FILE_TYPE_REGULAR:   file_type="FILE"; break;
 		case GNOME_VFS_FILE_TYPE_DIRECTORY: file_type="DIR ";  break;
 		case GNOME_VFS_FILE_TYPE_SOCKET:    file_type="DEV ";  break;
 		default:                            file_type="??? ";  break;
 		}
 
-	if (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
+	if (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
 		file_perms="???";
-	else if (file_info->permissions & GNOME_VFS_PERM_USER_WRITE)
+	else if (captive_file_info_object->p.permissions & GNOME_VFS_PERM_USER_WRITE)
 		file_perms="r/w";
 	else
 		file_perms="r/o";
 
-	if (file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-		file_size=g_strdup_printf("%8" GNOME_VFS_SIZE_FORMAT_STR,file_info->size);
+	if (captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
+		file_size=g_strdup_printf("%8" GNOME_VFS_SIZE_FORMAT_STR,captive_file_info_object->p.size);
 	else
 		file_size=g_strdup_printf("%8s","???");
 
 	/*      type pm sz nm */
-	printf("[%s] %s %s %s\n",file_type,file_perms,file_size,file_info->name);
+	printf("[%s] %s %s %s\n",file_type,file_perms,file_size,CMD_LOCALE_FROM_UTF8_ALLOCA(captive_file_info_object->p.name));
 	
 	g_free(file_size);
 }
 
+static void timespec_split_print(time_t sec,guint nsec)
+{
+char *ctime_buf,*s;
+
+	g_return_if_fail(sec!=0);
+	g_return_if_fail(nsec<1000000000);
+
+	ctime_buf=ctime(&sec);
+	if ((s=strchr(ctime_buf,'\n')))
+		*s='\0';
+	printf("%s +%09u nsec\n",ctime_buf,(unsigned)nsec);
+}
 
-void file_info_dump_full(const GnomeVFSFileInfo *file_info,GError **errp)
+void cmdline_captive_file_info_object_dump_full(CaptiveFileInfoObject *captive_file_info_object,GError **errp)
 {
+	g_return_if_fail(CAPTIVE_FILE_INFO_IS_OBJECT(captive_file_info_object));
 	g_return_if_fail(!errp || !*errp);
 
-	printf("Filename: %s\n",file_info->name);
+	printf("Filename: %s\n",CMD_LOCALE_FROM_UTF8_ALLOCA(captive_file_info_object->p.name));
 
 	fputs("File type: ",stdout);
-	switch (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ? GNOME_VFS_FILE_TYPE_UNKNOWN : file_info->type) {
+	switch (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ? GNOME_VFS_FILE_TYPE_UNKNOWN : captive_file_info_object->p.type) {
 		case GNOME_VFS_FILE_TYPE_REGULAR:   puts("REGULAR");   break;
 		case GNOME_VFS_FILE_TYPE_DIRECTORY: puts("DIRECTORY"); break;
 		case GNOME_VFS_FILE_TYPE_SOCKET:    puts("SOCKET");    break;
@@ -89,40 +104,40 @@ void file_info_dump_full(const GnomeVFSFileInfo *file_info,GError **errp)
 		}
 
 	fputs("File size: ",stdout);
-	if (file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-		printf("%" GNOME_VFS_SIZE_FORMAT_STR "\n",file_info->size);
+	if (captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
+		printf("%" GNOME_VFS_SIZE_FORMAT_STR "\n",captive_file_info_object->p.size);
 	else
 		puts("???");
 
 	fputs("Block count: ",stdout);
-	if (file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_BLOCK_COUNT)
-		printf("%" GNOME_VFS_SIZE_FORMAT_STR "\n",file_info->block_count);
+	if (captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_BLOCK_COUNT)
+		printf("%" GNOME_VFS_SIZE_FORMAT_STR "\n",captive_file_info_object->p.block_count);
 	else
 		puts("???");
 
 	fputs("Writable?: ",stdout);
-	if (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
+	if (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
 		puts("???");
-	else if (file_info->permissions & GNOME_VFS_PERM_USER_WRITE)
+	else if (captive_file_info_object->p.permissions & GNOME_VFS_PERM_USER_WRITE)
 		puts("read/write");
 	else
 		puts("read/only");
 
 	fputs("Access-time (atime): ",stdout);
-	if (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ATIME))
+	if (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ATIME))
 		puts("???");
 	else
-		fputs(ctime(&file_info->atime),stdout);
+		timespec_split_print(captive_file_info_object->p.atime,captive_file_info_object->atime_nsec);
 
 	fputs("Modification-time (mtime): ",stdout);
-	if (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MTIME))
+	if (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MTIME))
 		puts("???");
 	else
-		fputs(ctime(&file_info->mtime),stdout);
+		timespec_split_print(captive_file_info_object->p.mtime,captive_file_info_object->mtime_nsec);
 
 	fputs("Change-time (ctime): ",stdout);
-	if (!(file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME))
+	if (!(captive_file_info_object->p.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME))
 		puts("???");
 	else
-		fputs(ctime(&file_info->ctime),stdout);
+		timespec_split_print(captive_file_info_object->p.ctime,captive_file_info_object->ctime_nsec);
 }