Revise the code for loading configuration files #1519

masatake · 2017-08-02T18:14:41Z

option-directory feature was not available on platforms
where scandir is not available.

coveralls · 2017-08-02T18:34:30Z

Coverage increased (+0.002%) to 85.386% when pulling 41460a9 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

k-takata · 2017-08-02T22:49:05Z

main/options.c

@@ -511,7 +507,7 @@ static struct Feature {
 #ifdef DEBUG
 	{"debug", "TO BE WRITTEN"},
 #endif
-#ifdef HAVE_SCANDIR
+#if defined(HAVE_SCANDIR) || defined (HAVE_DIRENT_H) || defined (_MSVC)


_MSVC should be _MSC_VER.

k-takata · 2017-08-02T22:52:14Z

main/portable-scandir.c

+            if (counter + 1 == allocated) {
+                allocated <<= 1;
+                array = (struct dirent **)
+                    realloc_safe((char *)array, allocated * sizeof(struct dirent *));


https://ci.appveyor.com/project/universalctags/ctags/build/1.0.183/job/1p916w3u7sc4hjoh#L261
Build failed because of realloc_safe.

Thank you very much.

coveralls · 2017-08-03T02:39:20Z

Coverage increased (+0.002%) to 85.386% when pulling dc52e6f on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-03T02:54:21Z

Coverage increased (+0.002%) to 85.386% when pulling a15c692 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-03T04:25:46Z

Coverage increased (+0.002%) to 85.386% when pulling eb720c3 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-03T04:37:13Z

Coverage increased (+0.002%) to 85.386% when pulling c9fa895 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

masatake · 2017-08-03T15:10:24Z

O.k. we can use scandir any platform where ctags runs.

I will remove ~/.ctags file support from u-ctags. Instead I will introduce ~/.u-ctags DIRECTORY.
After introducing the directory, I can write ctags-optlib.5.

k-takata · 2017-08-03T15:49:18Z

msbuild fails with unknown error.
https://ci.appveyor.com/project/universalctags/ctags/build/1.0.187/job/2qhhrnjdpapk8xal#L345
It is very strange that ctags --version fails.

msvc x64 build fails with the option-extras-enabling-all test.
https://ci.appveyor.com/project/universalctags/ctags/build/1.0.187/job/t8gh3aic9b11ykxf#L1326

coveralls · 2017-08-03T23:22:51Z

Coverage increased (+0.002%) to 85.386% when pulling a79f557 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-04T01:16:49Z

Coverage increased (+0.002%) to 85.386% when pulling b77c8be on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

k-takata · 2017-08-04T01:27:53Z

main/portable-dirent.h

+#endif
+
+#else
+#erorr "No dirent.h"


Still failing because of these two lines. You can remove them now.
If you think they are still needed, then you should move them between L388 and L389.
s/#erorr/#error/

Oh, Thank you.

The last change is not enough. I meant:

--- a/main/portable-dirent.h +++ b/main/portable-dirent.h @@ -382,8 +382,8 @@ static void rewinddir(DIR* dirp) } #endif -#else -#error "dirent.h is not available." #endif /*DIRENT_H*/ +#else +#error "dirent.h is not available." #endif /* HAVE_DIRENT_H */

coveralls · 2017-08-04T01:53:29Z

Coverage increased (+0.002%) to 85.386% when pulling a5a0a29 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

masatake · 2017-08-04T01:56:58Z

@k-takata, I have a question about filename on Windows.

https://ja.wikipedia.org/wiki/8.3%E5%BD%A2%E5%BC%8F (Japanese)

This limitation(?) about file name is still applicable (or existing) in Windows these days?

I would like to use '.ctags' as an extension for ctags option library on all platforms where u-ctags runs.

However, man page of exuberant-ctags says


FILES
       /ctags.cnf (on MSDOS, MSWindows only)
       /etc/ctags.conf
       /usr/local/etc/ctags.conf
       $HOME/.ctags
       $HOME/ctags.cnf (on MSDOS, MSWindows only)
       .ctags
       ctags.cnf (on MSDOS, MSWindows only)

.cnf is used as an extension.

I think we can forget MSDOS. Do you agree this?
If the answer is yes, can we use .ctags intead of .cnf as an extension on MSWindows?

coveralls · 2017-08-04T02:09:35Z

Coverage increased (+0.002%) to 85.386% when pulling c9f6e48 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

k-takata · 2017-08-04T02:32:21Z

I don't think we should still care about the 8.3 filenames.
We can use .ctags as an extension.
However, we should care about filenames starting with a dot. (E.g. $HOME/.ctags)
Windows filesystems can store such filenames, but need a trick to create them on Explorer (and other GUI tools). If a use create a filename with .ctags. (with an additional dot), it will be stored as .ctags.

k-takata · 2017-08-04T02:35:42Z

Another new errors: https://ci.appveyor.com/project/universalctags/ctags/build/1.0.191/job/mgh91tgiii06simc#L72

main\portable-scandir.c(200) : error C2039: 'd_ino' : is not a member of 'dirent'
        c:\projects\ctags\main\portable-dirent.h(167) : see declaration of 'dirent'
        c:\projects\ctags\main\portable-dirent.h(167) : see declaration of 'dirent'
main\portable-scandir.c(201) : error C2039: 'd_reclen' : is not a member of 'dirent'
        c:\projects\ctags\main\portable-dirent.h(167) : see declaration of 'dirent'
        c:\projects\ctags\main\portable-dirent.h(167) : see declaration of 'dirent'

coveralls · 2017-08-04T02:40:49Z

Coverage increased (+0.002%) to 85.386% when pulling dbde971 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

masatake · 2017-08-04T02:45:20Z

I don't think we should still care about the 8.3 filenames.
We can use .ctags as an extension.
However, we should care about filenames starting with a dot. (E.g. $HOME/.ctags)
Windows filesystems can store such filenames, but need a trick to create them on Explorer (and other GUI tools). If a use create a filename with .ctags. (with an additional dot), it will be stored as .ctags.

Thank you. I hope I can find time to think about the new file names in this weekend.

coveralls · 2017-08-04T02:49:03Z

Coverage increased (+0.002%) to 85.386% when pulling 70caa13 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-04T02:58:46Z

Coverage increased (+0.002%) to 85.386% when pulling cb184a3 on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

coveralls · 2017-08-04T03:18:52Z

Coverage increased (+0.002%) to 85.386% when pulling ce12dba on masatake:portable-scandir-implementation into 6ad80f4 on universal-ctags:master.

k-takata · 2017-08-04T03:26:28Z

main/portable-scandir.c

@@ -0,0 +1,243 @@
+#include "general.h"
+/*
+ * Taken from https://raw.githubusercontent.com/ClusterLabs/pacemaker/master/replace/scandir.c


Isn't it better to use non-raw URL, so that one can easily get the information (history, etc.) of the file?
https://github.com/ClusterLabs/pacemaker/blob/master/replace/scandir.c

k-takata · 2017-08-04T03:26:40Z

main/portable-scandir.c

+ * The original author put this code in the public domain.
+ * It has been modified slightly to get rid of warnings, etc.
+ *
+ * Below is the email I received from pinard@iro.umontreal.ca (Fran�ois Pinard)


Encoding seems broken.
s/Fran�ois/François/
The original file was latin 1 (ISO 8859-1), but maybe it's batter to use UTF-8?

k-takata · 2017-08-04T03:27:10Z

main/portable-scandir.c

+ *
+ * Subject:	Re: Scandir replacement function
+ * Date:	18 May 2001 12:00:48 -0400
+ * From:	pinard@iro.umontreal.ca (Fran�ois Pinard)


Same as above.

masatake · 2017-08-04T04:13:38Z

@k-takata, reflected the your comment to the changes and updated.

I update portable-getdents.h. So we will get build-errors again.

k-takata · 2017-08-04T04:44:44Z

eMalloc and eFree are used in portable-dirent.h, but they are declared in routine.h after including portable-dirent.h.
portable-dirent.h should be included in routine.h after declaring them.

Now PATH_MAX is defined in portable-dirent.h, but routines.c also defines PATH_MAX in line 140, so they conflict. Line 140 can be removed.

masatake · 2017-08-04T12:13:11Z

Something wrong in circleci. However, we can ignore it.

@k-takata, thank you for great advices. Especially the last comment is really helpful.
I have taken too many mistakes. A bit tired.

I will squash some of commits.

…d .d when loading optlib files TODO Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

@k-takata

Spotted by @k-takata. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Does the same as ``--options`` but doesn't make an error if *file* (or *directory*) doesn't exist. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

…tlib-dir

@codebrainz

…and --options Suggested by @codebrainz and @k-takata.

@k-takata

Suggested by @k-takata. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

masatake · 2017-10-13T09:52:01Z

Squashed some "fixup!" commits.

coveralls · 2017-10-13T09:58:33Z

Coverage decreased (-0.04%) to 85.943% when pulling 6c25428 on masatake:portable-scandir-implementation into be525b6 on universal-ctags:master.

Refer to universal-ctags/ctags#1519. [ci skip]

<universal-ctags/ctags#1519>

k-takata reviewed Aug 2, 2017

View reviewed changes

masatake force-pushed the portable-scandir-implementation branch from dc52e6f to a15c692 Compare August 3, 2017 02:49

masatake force-pushed the portable-scandir-implementation branch from eb720c3 to c9fa895 Compare August 3, 2017 04:32

masatake force-pushed the portable-scandir-implementation branch from c9fa895 to a79f557 Compare August 3, 2017 18:38

k-takata reviewed Aug 4, 2017

View reviewed changes

masatake force-pushed the portable-scandir-implementation branch from ce12dba to 44c718c Compare August 4, 2017 04:12

masatake force-pushed the portable-scandir-implementation branch from 281a57a to 1f89dbb Compare August 4, 2017 12:21

masatake added 16 commits October 13, 2017 18:51

[SELF INCOMPATIBLE] main: don't limit files and directories .ctags an…

0128591

…d .d when loading optlib files TODO Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Tmain: add cases for testing loading configuration files

c06b29f

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

dicts: updated

a828697

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

docs: write about new preload path and optlib feature

a334372

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

main,refactor: fix misdirected function name

c8f88a1

Spotted by @k-takata. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

main: update the description of --options in --help message

e076dab

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

docs(man): update FILES section

609346c

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Tmain: add a case for testing --optlib-dir option

5380404

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

main: introduce --options-maybe

7f74e49

Does the same as ``--options`` but doesn't make an error if *file* (or *directory*) doesn't exist. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

docs(man): write about the incompatiblity about preload files

d7b5120

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

docs(man): update the description for --options, and write about --op…

05a89f4

…tlib-dir

docs(man): update README

1cdff28

docs(man): fix grammetical errors in the description of --optlib-dir …

189645e

…and --options Suggested by @codebrainz and @k-takata.

docs(man): add a note on a preload file

31e3e74

Suggested by @k-takata. Signed-off-by: Masatake YAMATO <yamato@redhat.com>

docs(web): fix a grammatical error

8e95a95

docs(README.md): write about new configuration files

6c25428

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

masatake force-pushed the portable-scandir-implementation branch from 61ba2cf to 6c25428 Compare October 13, 2017 09:51

masatake merged commit d9944ef into universal-ctags:master Oct 13, 2017

This was referenced Oct 13, 2017

path and directiries for optlib and xcmd #92

Closed

Imporve/fix some scopes reported by the JavaScript parser #1568

Merged

k-takata added a commit to universal-ctags/ctags-win32 that referenced this pull request Oct 16, 2017

Add a note about incompatibility by the recent update

c1a9c9b

Refer to universal-ctags/ctags#1519. [ci skip]

This was referenced Oct 16, 2017

Add a note about incompatibility by the recent update universal-ctags/ctags-win32#2

Merged

$HOME/.ctags not used #1582

Closed

nicolashainaux mentioned this pull request Nov 5, 2017

update universal-ctags binary shipped with the extension nicolashainaux/symbols-tree-nav#12

Open

justinmk mentioned this pull request Nov 27, 2017

Use XDG dirs spec for data/config #89

Closed

k-takata mentioned this pull request Dec 11, 2017

gtags not respecting .ctags file #1608

Closed

mzlogin added a commit to mzlogin/config-files that referenced this pull request Sep 4, 2018

universal-ctags doesn't load ~/.ctags anymore, see

784ec0c

<universal-ctags/ctags#1519>

mzlogin added a commit to mzlogin/config-files that referenced this pull request Apr 16, 2019

universal-ctags doesn't load ~/.ctags anymore, see

02410db

<universal-ctags/ctags#1519>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revise the code for loading configuration files #1519

Revise the code for loading configuration files #1519

masatake commented Aug 2, 2017

coveralls commented Aug 2, 2017

k-takata Aug 2, 2017

k-takata Aug 2, 2017

masatake Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

masatake commented Aug 3, 2017

k-takata commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 4, 2017

k-takata Aug 4, 2017

masatake Aug 4, 2017

k-takata Aug 4, 2017

coveralls commented Aug 4, 2017

masatake commented Aug 4, 2017

coveralls commented Aug 4, 2017

k-takata commented Aug 4, 2017

k-takata commented Aug 4, 2017

coveralls commented Aug 4, 2017

masatake commented Aug 4, 2017 •

edited

Loading

coveralls commented Aug 4, 2017

coveralls commented Aug 4, 2017

coveralls commented Aug 4, 2017

k-takata Aug 4, 2017

k-takata Aug 4, 2017

k-takata Aug 4, 2017

masatake commented Aug 4, 2017

k-takata commented Aug 4, 2017

masatake commented Aug 4, 2017 •

edited

Loading

masatake commented Oct 13, 2017

coveralls commented Oct 13, 2017

Revise the code for loading configuration files #1519

Revise the code for loading configuration files #1519

Conversation

masatake commented Aug 2, 2017

coveralls commented Aug 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 3, 2017

masatake commented Aug 3, 2017

k-takata commented Aug 3, 2017

coveralls commented Aug 3, 2017

coveralls commented Aug 4, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Aug 4, 2017

masatake commented Aug 4, 2017

coveralls commented Aug 4, 2017

k-takata commented Aug 4, 2017

k-takata commented Aug 4, 2017

coveralls commented Aug 4, 2017

masatake commented Aug 4, 2017 • edited Loading

coveralls commented Aug 4, 2017

coveralls commented Aug 4, 2017

coveralls commented Aug 4, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

masatake commented Aug 4, 2017

k-takata commented Aug 4, 2017

masatake commented Aug 4, 2017 • edited Loading

masatake commented Oct 13, 2017

coveralls commented Oct 13, 2017

masatake commented Aug 4, 2017 •

edited

Loading

masatake commented Aug 4, 2017 •

edited

Loading