diff options
-rw-r--r-- | examples/lsf.c | 2 | ||||
-rw-r--r-- | include/mailutils/cpp/folder.h | 4 | ||||
-rw-r--r-- | include/mailutils/folder.h | 9 | ||||
-rw-r--r-- | libmailutils/mailbox/folder.c | 8 | ||||
-rw-r--r-- | libmailutils/mailbox/fsfolder.c | 12 | ||||
-rw-r--r-- | libmailutils/tests/fsfolder.c | 8 | ||||
-rw-r--r-- | libmu_cpp/folder.cc | 8 | ||||
-rw-r--r-- | libproto/imap/folder.c | 4 | ||||
-rw-r--r-- | libproto/imap/genlist.c | 12 | ||||
-rw-r--r-- | libproto/imap/tests/imapfolder.c | 2 | ||||
-rw-r--r-- | libproto/nntp/folder.c | 2 | ||||
-rw-r--r-- | mu/libexec/imap.c | 2 | ||||
-rw-r--r-- | python/2/libmu_py/folder.c | 8 | ||||
-rw-r--r-- | python/2/mailutils/folder.py | 4 | ||||
-rw-r--r-- | python/3/libmu_py/folder.c | 10 | ||||
-rw-r--r-- | python/3/mailutils/folder.py | 4 |
16 files changed, 50 insertions, 49 deletions
diff --git a/examples/lsf.c b/examples/lsf.c index cba79d30c..c38689352 100644 --- a/examples/lsf.c +++ b/examples/lsf.c | |||
@@ -29,7 +29,7 @@ enumfun (mu_folder_t folder, struct mu_list_response *resp, void *data) | |||
29 | (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-', | 29 | (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-', |
30 | (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-', | 30 | (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-', |
31 | resp->separator, | 31 | resp->separator, |
32 | resp->level, | 32 | resp->depth, |
33 | resp->name); | 33 | resp->name); |
34 | return 0; | 34 | return 0; |
35 | } | 35 | } |
diff --git a/include/mailutils/cpp/folder.h b/include/mailutils/cpp/folder.h index fe4ed77c5..97c6d0fd4 100644 --- a/include/mailutils/cpp/folder.h +++ b/include/mailutils/cpp/folder.h | |||
@@ -43,9 +43,9 @@ class Folder | |||
43 | void open (int flag); | 43 | void open (int flag); |
44 | void close (); | 44 | void close (); |
45 | 45 | ||
46 | List& list (const std::string& dirname, void* pattern, size_t max_level); | 46 | List& list (const std::string& dirname, void* pattern, size_t max_depth); |
47 | List& enumerate (const std::string& name, void* pattern, | 47 | List& enumerate (const std::string& name, void* pattern, |
48 | int flags, size_t max_level, | 48 | int flags, size_t max_depth, |
49 | mu_folder_enumerate_fp enumfun, void* enumdata); | 49 | mu_folder_enumerate_fp enumfun, void* enumdata); |
50 | 50 | ||
51 | Url& get_url (); | 51 | Url& get_url (); |
diff --git a/include/mailutils/folder.h b/include/mailutils/folder.h index 4ca4b92ee..ceb54dd62 100644 --- a/include/mailutils/folder.h +++ b/include/mailutils/folder.h | |||
@@ -27,9 +27,9 @@ extern "C" { | |||
27 | struct mu_list_response | 27 | struct mu_list_response |
28 | { | 28 | { |
29 | int type; /* MU_FOLDER_ATTRIBUTE_.* flags */ | 29 | int type; /* MU_FOLDER_ATTRIBUTE_.* flags */ |
30 | int level; | 30 | int depth; /* Item depth within the hierarchy */ |
31 | int separator; | 31 | int separator; /* Directory separator character */ |
32 | char *name; | 32 | char *name; /* Item name */ |
33 | mu_record_t format; /* Associated mailbox format record */ | 33 | mu_record_t format; /* Associated mailbox format record */ |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -66,7 +66,8 @@ struct mu_folder_scanner | |||
66 | char const *refname; /* Reference name */ | 66 | char const *refname; /* Reference name */ |
67 | void *pattern; /* Matching pattern */ | 67 | void *pattern; /* Matching pattern */ |
68 | int match_flags; /* Matching flags */ | 68 | int match_flags; /* Matching flags */ |
69 | size_t max_level; /* Max. nesting level to descend */ | 69 | size_t max_depth; /* Max. depth to descend |
70 | (1-based, 0 means 'unlimited') */ | ||
70 | mu_folder_enumerate_fp enumfun; /* Enumeration function */ | 71 | mu_folder_enumerate_fp enumfun; /* Enumeration function */ |
71 | void *enumdata; /* Data for enumfun */ | 72 | void *enumdata; /* Data for enumfun */ |
72 | mu_list_t records; /* List of allowed records */ | 73 | mu_list_t records; /* List of allowed records */ |
diff --git a/libmailutils/mailbox/folder.c b/libmailutils/mailbox/folder.c index 8a474c8f6..d22bb3315 100644 --- a/libmailutils/mailbox/folder.c +++ b/libmailutils/mailbox/folder.c | |||
@@ -356,18 +356,18 @@ mu_folder_scan (mu_folder_t folder, struct mu_folder_scanner *scn) | |||
356 | 356 | ||
357 | int | 357 | int |
358 | mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern, | 358 | mu_folder_list (mu_folder_t folder, const char *dirname, void *pattern, |
359 | size_t max_level, | 359 | size_t max_depth, |
360 | mu_list_t *pflist) | 360 | mu_list_t *pflist) |
361 | { | 361 | { |
362 | return mu_folder_enumerate (folder, dirname, pattern, | 362 | return mu_folder_enumerate (folder, dirname, pattern, |
363 | MU_FOLDER_ATTRIBUTE_ALL, max_level, | 363 | MU_FOLDER_ATTRIBUTE_ALL, max_depth, |
364 | pflist, NULL, NULL); | 364 | pflist, NULL, NULL); |
365 | } | 365 | } |
366 | 366 | ||
367 | int | 367 | int |
368 | mu_folder_enumerate (mu_folder_t folder, const char *name, | 368 | mu_folder_enumerate (mu_folder_t folder, const char *name, |
369 | void *pattern, int flags, | 369 | void *pattern, int flags, |
370 | size_t max_level, | 370 | size_t max_depth, |
371 | mu_list_t *pflist, | 371 | mu_list_t *pflist, |
372 | mu_folder_enumerate_fp enumfun, void *enumdata) | 372 | mu_folder_enumerate_fp enumfun, void *enumdata) |
373 | { | 373 | { |
@@ -383,7 +383,7 @@ mu_folder_enumerate (mu_folder_t folder, const char *name, | |||
383 | scn.refname = name; | 383 | scn.refname = name; |
384 | scn.pattern = pattern; | 384 | scn.pattern = pattern; |
385 | scn.match_flags = flags; | 385 | scn.match_flags = flags; |
386 | scn.max_level = max_level; | 386 | scn.max_depth = max_depth; |
387 | scn.enumfun = enumfun; | 387 | scn.enumfun = enumfun; |
388 | scn.enumdata = enumdata; | 388 | scn.enumdata = enumdata; |
389 | scn.records = NULL; | 389 | scn.records = NULL; |
diff --git a/libmailutils/mailbox/fsfolder.c b/libmailutils/mailbox/fsfolder.c index 553c9fddf..4afdbd6e9 100644 --- a/libmailutils/mailbox/fsfolder.c +++ b/libmailutils/mailbox/fsfolder.c | |||
@@ -294,13 +294,13 @@ static int | |||
294 | list_helper (struct mu_folder_scanner *scn, | 294 | list_helper (struct mu_folder_scanner *scn, |
295 | struct folder_scan_data *data, | 295 | struct folder_scan_data *data, |
296 | struct inode_list *ilist, | 296 | struct inode_list *ilist, |
297 | const char *dirname, size_t level) | 297 | const char *dirname, size_t depth) |
298 | { | 298 | { |
299 | DIR *dirp; | 299 | DIR *dirp; |
300 | struct dirent *dp; | 300 | struct dirent *dp; |
301 | int stop = 0; | 301 | int stop = 0; |
302 | 302 | ||
303 | if (scn->max_level && level >= scn->max_level) | 303 | if (scn->max_depth && depth >= scn->max_depth) |
304 | return 0; | 304 | return 0; |
305 | 305 | ||
306 | dirp = opendir (dirname); | 306 | dirp = opendir (dirname); |
@@ -377,7 +377,7 @@ list_helper (struct mu_folder_scanner *scn, | |||
377 | else | 377 | else |
378 | { | 378 | { |
379 | resp->name = fname; | 379 | resp->name = fname; |
380 | resp->level = level; | 380 | resp->depth = depth; |
381 | resp->separator = '/'; | 381 | resp->separator = '/'; |
382 | resp->type = type; | 382 | resp->type = type; |
383 | resp->format = rec; | 383 | resp->format = rec; |
@@ -421,7 +421,7 @@ list_helper (struct mu_folder_scanner *scn, | |||
421 | idata.dev = st.st_dev; | 421 | idata.dev = st.st_dev; |
422 | idata.next = ilist; | 422 | idata.next = ilist; |
423 | stop = list_helper (scn, data, &idata, refname, | 423 | stop = list_helper (scn, data, &idata, refname, |
424 | level + 1); | 424 | depth + 1); |
425 | } | 425 | } |
426 | } | 426 | } |
427 | else if (S_ISDIR (st.st_mode)) | 427 | else if (S_ISDIR (st.st_mode)) |
@@ -431,7 +431,7 @@ list_helper (struct mu_folder_scanner *scn, | |||
431 | idata.inode = st.st_ino; | 431 | idata.inode = st.st_ino; |
432 | idata.dev = st.st_dev; | 432 | idata.dev = st.st_dev; |
433 | idata.next = ilist; | 433 | idata.next = ilist; |
434 | stop = list_helper (scn, data, &idata, fname, level + 1); | 434 | stop = list_helper (scn, data, &idata, fname, depth + 1); |
435 | } | 435 | } |
436 | } | 436 | } |
437 | } | 437 | } |
@@ -508,7 +508,7 @@ _fsfolder_lsub (mu_folder_t folder, const char *ref, const char *name, | |||
508 | break; | 508 | break; |
509 | } | 509 | } |
510 | resp->type = MU_FOLDER_ATTRIBUTE_FILE; | 510 | resp->type = MU_FOLDER_ATTRIBUTE_FILE; |
511 | resp->level = 0; | 511 | resp->depth = 0; |
512 | resp->separator = '/'; | 512 | resp->separator = '/'; |
513 | rc = mu_list_append (flist, resp); | 513 | rc = mu_list_append (flist, resp); |
514 | if (rc) | 514 | if (rc) |
diff --git a/libmailutils/tests/fsfolder.c b/libmailutils/tests/fsfolder.c index 5a4d9df7d..e6c45b7f0 100644 --- a/libmailutils/tests/fsfolder.c +++ b/libmailutils/tests/fsfolder.c | |||
@@ -44,9 +44,9 @@ compare_response (void const *a, void const *b) | |||
44 | struct mu_list_response const *ra = a; | 44 | struct mu_list_response const *ra = a; |
45 | struct mu_list_response const *rb = b; | 45 | struct mu_list_response const *rb = b; |
46 | 46 | ||
47 | if (ra->level < rb->level) | 47 | if (ra->depth < rb->depth) |
48 | return -1; | 48 | return -1; |
49 | if (ra->level > rb->level) | 49 | if (ra->depth > rb->depth) |
50 | return 1; | 50 | return 1; |
51 | return strcmp (ra->name, rb->name); | 51 | return strcmp (ra->name, rb->name); |
52 | } | 52 | } |
@@ -60,7 +60,7 @@ _print_list_entry (void *item, void *data) | |||
60 | (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-', | 60 | (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) ? 'd' : '-', |
61 | (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-', | 61 | (resp->type & MU_FOLDER_ATTRIBUTE_FILE) ? 'f' : '-', |
62 | resp->separator ? resp->separator : ' ', | 62 | resp->separator ? resp->separator : ' ', |
63 | resp->level, | 63 | resp->depth, |
64 | resp->name + len); |