Skip to content

Commit 3e8292e

Browse files
committed
sync awtk
1 parent 33dab6b commit 3e8292e

File tree

6 files changed

+35
-5
lines changed

6 files changed

+35
-5
lines changed

src/platforms/pc/fs_os.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,25 @@ static ret_t fs_os_dir_read(fs_dir_t* dir, fs_item_t* item) {
169169

170170
memset(item, 0x00, sizeof(fs_item_t));
171171
if (ent != NULL) {
172+
#ifdef QNX
173+
struct stat st;
174+
char filename[MAX_PATH + 1] = {0};
175+
tk_snprintf(filename, sizeof(filename) - 1, "%s/%s", dir->dirname, ent->d_name);
176+
177+
if (stat(filename, &st) == 0) {
178+
item->is_dir = (st.st_mode & S_IFDIR) != 0;
179+
item->is_link = (st.st_mode & S_IFLNK) != 0;
180+
item->is_reg_file = (st.st_mode & S_IFREG) != 0;
181+
} else {
182+
item->is_reg_file = 1;
183+
}
184+
#else
172185
uint8_t type = ent->d_type;
173186
item->is_dir = (type & DT_DIR) != 0;
174187
item->is_link = (type & DT_LNK) != 0;
175188
item->is_reg_file = (type & DT_REG) != 0;
189+
#endif
190+
176191
#ifdef WIN32
177192
str_t str;
178193
str_init(&str, wcslen(ent->d_name) * 4 + 1);

src/streams/inet/istream_udp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#ifndef WIN32_LEAN_AND_MEAN
2323
#define WIN32_LEAN_AND_MEAN 1
2424
#endif /*WIN32_LEAN_AND_MEAN*/
25-
2625
#include "tkc/mem.h"
2726
#include "tkc/socket_helper.h"
2827
#include "streams/inet/istream_udp.h"

src/tkc/fs.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ ret_t fs_dir_read(fs_dir_t* dir, fs_item_t* item) {
145145

146146
ret_t fs_dir_close(fs_dir_t* dir) {
147147
return_value_if_fail(dir != NULL && dir->vt != NULL && dir->vt->close != NULL, RET_BAD_PARAMS);
148-
148+
TKMEM_FREE(dir->dirname);
149149
return dir->vt->close(dir);
150150
}
151151

@@ -175,9 +175,14 @@ ret_t fs_file_rename(fs_t* fs, const char* name, const char* new_name) {
175175
}
176176

177177
fs_dir_t* fs_open_dir(fs_t* fs, const char* name) {
178+
fs_dir_t* dir = NULL;
178179
return_value_if_fail(fs != NULL && fs->open_dir != NULL && name != NULL, NULL);
179180

180-
return fs->open_dir(fs, name);
181+
dir = fs->open_dir(fs, name);
182+
return_value_if_fail(dir != NULL, NULL);
183+
dir->dirname = tk_strdup(name);
184+
185+
return dir;
181186
}
182187

183188
ret_t fs_remove_dir(fs_t* fs, const char* name) {

src/tkc/fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ typedef struct _fs_dir_vtable_t {
364364
struct _fs_dir_t {
365365
const fs_dir_vtable_t* vt;
366366
void* data;
367+
char* dirname;
367368
};
368369

369370
/**

src/tkc/serial_helper.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,14 +535,19 @@ ret_t serial_wait_for_data(serial_handle_t handle, uint32_t timeout_ms) {
535535
#include <unistd.h>
536536
#include <fcntl.h>
537537
#include <sys/ioctl.h>
538-
#include <sys/signal.h>
539538
#include <errno.h>
540539
#include <paths.h>
541-
#include <sysexits.h>
542540
#include <termios.h>
543541
#include <sys/param.h>
544542
#include <pthread.h>
545543

544+
#ifndef QNX
545+
#include <sysexits.h>
546+
#include <sys/signal.h>
547+
#else
548+
#include <signal.h>
549+
#endif/*QNX*/
550+
546551
#if defined(__linux__)
547552
#include <linux/serial.h>
548553
#endif
@@ -934,6 +939,7 @@ ret_t serial_config(serial_handle_t handle, uint32_t baudrate, bytesize_t bytesi
934939
options.c_cflag |= (CNEW_RTSCTS);
935940
else
936941
options.c_cflag &= (unsigned long)~(CNEW_RTSCTS);
942+
#elif defined(QNX)
937943
#else
938944
#error "OS Support seems wrong."
939945
#endif

tools/idl_gen/idl_gen.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ class IDLGen {
192192

193193
property.desc = this.normalizeDesc(property.desc);
194194
if(this.cls) {
195+
if (!this.cls.properties) {
196+
console.log(this.cls);
197+
console.log(property);
198+
}
195199
this.cls.properties.push(property);
196200
}
197201

0 commit comments

Comments
 (0)