[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1663 -
From: codesite-noreply () google ! com
Date: 2008-08-23 17:50:47
Message-ID: 000e0cd296acae0f920455243116 () google ! com
[Download RAW message or body]
Author: cristian.debian
Date: Sat Aug 23 10:50:14 2008
New Revision: 1663
Modified:
branches/cristian/fusioniso/fusioniso/src/fs.c
branches/cristian/fusioniso/fusioniso/src/fs.h
branches/cristian/fusioniso/fusioniso/src/fusemain.c
branches/cristian/fusioniso/fusioniso/src/isofs.c
branches/cristian/fusioniso/fusioniso/src/isofs.h
Log:
- check and adjust all include headers;
- check for HAVE_SETXATTR before using (set|get|list|remove)xattr functions;
- move isofs_free_inode from isofs.c to isofs.h as 'static inline';
- minor changes in fs.h.
Modified: branches/cristian/fusioniso/fusioniso/src/fs.c
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fs.c (original)
+++ branches/cristian/fusioniso/fusioniso/src/fs.c Sat Aug 23 10:50:14 2008
@@ -76,27 +76,25 @@
*
*/
-// for struct tm->tm_gmtoff
#define _BSD_SOURCE
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <glib.h>
-#include <string.h>
#include <unistd.h>
+#include <stdio.h>
#include <stdlib.h>
-#include <assert.h>
-#include <zlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
#include <dirent.h>
#include <libgen.h>
-#include <pthread.h>
-#include <sys/statfs.h>
-#include <iconv.h>
-#include <errno.h>
+#include <glib.h>
+
+#ifdef HAVE_SETXATTR
+#include <sys/xattr.h>
+#endif
+
#include "fs.h"
-//#include "isofs.h"
+#include "isofs.h" // isofs_real_*
#include "debug.h"
extern char *extern_mount_point;
@@ -1433,6 +1431,7 @@
return utime(newpath, times);
}
+#ifdef HAVE_SETXATTR
int fs_real_setxattr(const char *path, const char *name, const void *value,
size_t size, int options)
{
@@ -1510,3 +1509,4 @@
if (fs_home_stat(path,&newpath,&v_stbuf) == -1)
fs_file_dup(path,newpath);
return removexattr(newpath, name);
}
+#endif /* HAVE_SETXATTR */
Modified: branches/cristian/fusioniso/fusioniso/src/fs.h
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fs.h (original)
+++ branches/cristian/fusioniso/fusioniso/src/fs.h Sat Aug 23 10:50:14 2008
@@ -19,9 +19,13 @@
#ifndef _FS_H
#define _FS_H
-#include "isofs.h"
+#include <utime.h>
+#include <sys/stat.h>
+#include <sys/statfs.h> // fix fs_real_statfs and include sys/statvfs.h
+#include <sys/types.h>
-#define PAGE_CACHE_SIZE (4096)
+
+#define PAGE_CACHE_SIZE (4096) // unused
#if defined(PATH_MAX)
#define FS_MAXPATH PATH_MAX
@@ -33,9 +37,7 @@
#define FS_MAXPATH 4096
#endif
-typedef struct statfs struct_statfs;
-
-typedef int u32; // needed on kubuntu 7.04 ...
+typedef int u32; // needed on kubuntu 7.04 ... (???)
typedef int bool;
#define true 1
@@ -43,8 +45,7 @@
typedef enum sandboxing { sandbox_none, sandbox_home, sandbox_portable,
sandbox_data } sandbox_type;
-typedef int (*fs_dir_fill_t) (void *buf, const char *name,
-const struct stat *stat, off_t off);
+typedef int (*fs_dir_fill_t) (void *buf, const char *name, const struct
stat *stat, off_t off);
int fs_real_opendir(const char *path);
int fs_real_readdir(int real, const char *path, void *filler_buf,
fs_dir_fill_t filler);
@@ -52,8 +53,9 @@
int fs_real_readlink(const char *path, char *target, size_t size);
int fs_real_open(const char *path);
int fs_real_read(const char *path, char *out_buf, size_t size, off_t
offset);
-int fs_real_statfs(const char *path, struct_statfs *stbuf);
+int fs_real_statfs(const char *path, struct statfs *stbuf);
+// klik2
int fs_real_access(const char *path, int amode);
int fs_real_mknod(const char *path, mode_t mode, dev_t dev);
int fs_real_write(const char *path, const char *out_buf, size_t size,
off_t offset);
Modified: branches/cristian/fusioniso/fusioniso/src/fusemain.c
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fusemain.c (original)
+++ branches/cristian/fusioniso/fusioniso/src/fusemain.c Sat Aug 23
10:50:14 2008
@@ -39,30 +39,24 @@
#include <config.h>
#endif
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <fcntl.h>
#include <errno.h>
-#include <unistd.h>
-#include <linux/stat.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <mntent.h>
-#include <sys/param.h>
+#include <mntent.h> // (set|add|end)mntent
#include <pwd.h>
-
-#include <fuse.h>
-
-#include <zlib.h>
#include <locale.h>
#include <langinfo.h>
-#include <linux/iso_fs.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <fuse.h>
-#include "fs.h"
-//#include "isofs.h"
+#include "fs.h" // fs_real_*
+#include "isofs.h" // isofs_real_preinit and isofs_real_init
#include "debug.h"
+
#ifdef __GNUC__
# define UNUSED(x) x __attribute__((unused))
#else
@@ -303,7 +297,7 @@
return fs_real_write(path, buf, size, offset);
}
-
+#ifdef HAVE_SETXATTR
static int fs_setxattr(const char *path, const char *name,
const char *value, size_t size, int options)
{
@@ -327,7 +321,7 @@
{
return fs_real_removexattr(path, name);
}
-
+#endif
static int fs_access(const char *path, int amode)
{
@@ -478,10 +472,12 @@
.chown = fs_chown,
.truncate = fs_truncate,
.utime = fs_utime,
+#ifdef HAVE_SETXATTR
.setxattr = fs_setxattr,
.getxattr = fs_getxattr,
.listxattr = fs_listxattr,
.removexattr = fs_removexattr,
+#endif
.access = fs_access,
};
Modified: branches/cristian/fusioniso/fusioniso/src/isofs.c
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/isofs.c (original)
+++ branches/cristian/fusioniso/fusioniso/src/isofs.c Sat Aug 23 10:50:14
2008
@@ -50,7 +50,20 @@
*
*/
-#include "fs.h"
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <utime.h>
+#include <iconv.h>
+#include <pthread.h>
+#include <glib.h>
+#include <zlib.h>
+
+#include <linux/rock.h>
+
+#include "isofs.h"
#include "debug.h"
static pthread_mutex_t fd_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -819,16 +832,6 @@
return outentry;
}
-}
-
-void isofs_free_inode(isofs_inode *inode)
-{
- if (inode == NULL) return;
- if (inode->SL && inode->sl) free(inode->sl);
- if (inode->NM && inode->nm) free(inode->nm);
- if (inode->zf_blockptr) free(inode->zf_blockptr);
- if (inode->record) free(inode->record);
- free(inode);
}
int isofs_parse_sa(isofs_inode *inode, char *sa, size_t sa_len)
Modified: branches/cristian/fusioniso/fusioniso/src/isofs.h
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/isofs.h (original)
+++ branches/cristian/fusioniso/fusioniso/src/isofs.h Sat Aug 23 10:50:14
2008
@@ -20,28 +20,11 @@
#define _ISOFS_H
#include <sys/stat.h>
-#include <linux/rock.h>
-#include <utime.h>
#include <sys/types.h>
-#include <attr/xattr.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <glib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <zlib.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <pthread.h>
-#include <sys/statfs.h>
-#include <iconv.h>
-#include <errno.h>
+#include <linux/iso_fs.h>
+
#include <byteswap.h>
-#include <linux/iso_fs.h>
typedef struct _isofs_context
{
@@ -115,8 +98,6 @@
/* Number conversion inlines, named after the section in ISO 9660
they correspond to. */
-#include <byteswap.h>
-
static inline int isonum_711(unsigned char *p)
{
return *(unsigned char *)p;
@@ -160,15 +141,23 @@
#endif
}
-
int isofs_real_preinit(char* imagefile, int fd);
void* isofs_real_init();
int isofs_read_raw_block(int block, char *buf);
int isofs_direntry2stat(struct stat *st, isofs_inode *inode);
char *isofs_fix_entry(char *entry, size_t len);
-void isofs_free_inode(isofs_inode *inode);
int isofs_parse_sa(isofs_inode *inode, char *sa, size_t sa_len);
int isofs_real_read_zf(isofs_inode *inode, char *out_buf, size_t size,
off_t offset);
+
+static inline void isofs_free_inode(isofs_inode *inode)
+{
+ if (inode == NULL) return;
+ if (inode->SL && inode->sl) free(inode->sl);
+ if (inode->NM && inode->nm) free(inode->nm);
+ if (inode->zf_blockptr) free(inode->zf_blockptr);
+ if (inode->record) free(inode->record);
+ free(inode);
+}
#endif /* _ISOFS_H */
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic