From 7b986e576706142c4664899877afe5239fcf9610 Mon Sep 17 00:00:00 2001
From: anon <anon@anon.anon>
Date: Sun, 1 Oct 2023 16:40:29 +0200
Subject: [PATCH] .

---
 hitags.py  | 14 +++++++-------
 hitags.vim | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hitags.py b/hitags.py
index 919f3a1..2431758 100755
--- a/hitags.py
+++ b/hitags.py
@@ -8,7 +8,7 @@ from subprocess import run, PIPE
 input_filename = ''
 preprocessor='clang -fdirectives-only -E {input_} -o {output}'
 tags_filename = 'vim.tags'
-polution_directory = '.'
+polution_directory = './'
 
 def print2(s):
 	print(s, file=sys.stderr)
@@ -22,7 +22,7 @@ def usage(name, x):
 	exit(x)
 
 def opts(args):
-	global input_filename, preprocessor
+	global input_filename, preprocessor, polution_directory
 
 	try:
 		i = args.index("--help") if "--help" in args else -1
@@ -100,22 +100,22 @@ def mimetype(filename):
 	return r
 
 def preprocessfile(filename):
-	global preprocessor
+	global preprocessor, polution_directory
 	output = polution_directory + "/" + "tags.i"
 	run(preprocessor.format(input_=filename, output=output), shell=True)
-	return out
+	return output
 
 def file2tags(filename, flags):
 	global tags_filename, polution_directory
 	ctags_command = "ctags --recurse --extras=+F --kinds-C=+px {extras} -o {output} {input_}"
 	output = polution_directory + "/" + tags_filename
 	cmd = ctags_command.format(extras=flags, output=output, input_=filename)
-	print2(cmd)
 	run(cmd, shell=True)
-	return tags_filename
+	return output
 
 def tags2hi(filename):
 	output = set()
+	print2(filename)
 	try:
 		with open(filename) as f:
 			csv_reader = csv.reader(f, delimiter='\t')
@@ -129,7 +129,7 @@ def tags2hi(filename):
 					except:
 						print2(row)
 	except FileNotFoundError as e:
-		print2("No such file or directory.")
+		print2(sys.argv[0] + ": No such file or directory '{0}'.".format(filename))
 		exit(1)
 	return output
 
diff --git a/hitags.vim b/hitags.vim
index 6f0688a..e05e4ae 100644
--- a/hitags.vim
+++ b/hitags.vim
@@ -9,7 +9,7 @@
 "  ~/.vim/plugin/HiTags/ is guaranteed to exist after installation,
 "  thats why it's the default
 "  otherwise you are responsible for creating your own
-let s:polution_directory = '~/.vim/plugin/HiTags/' 
+let s:polution_directory = expand('~/.vim/plugin/HiTags/')
 
 " Compiler to use for preprocessing C/C++, so headers are respected
 "  Either use "clang" or "gcc" or something compatible,
@@ -27,12 +27,12 @@ let s:tags_file          = expand(s:polution_directory) . s:tags_filename
 let s:tags_scriptname    = 'tags.vim'
 let s:tags_script        = expand(s:polution_directory) . 'tags.vim'
 "
-let s:generator_script   =  '~/.vim/plugin/HiTags/hitags.py'
+let s:generator_script   = expand('~/.vim/plugin/HiTags/hitags.py')
 let s:generation_command = 'python ' . s:generator_script .
-                         \ ' -i ' . expand('%:p') .
-                         \ ' -p ' . s:preprocessor .
-                         \ ' -t ' . s:polution_directory .
-                         \ '  > ' . s:polution_directory . s:tags_script
+                         \ ' -i ' . '"' . expand('%:p')        . '"' .
+                         \ ' -p ' . '"' . s:preprocessor       . '"' .
+                         \ ' -t ' . '"' . s:polution_directory . '"' .
+                         \ '  > ' . '"' . s:tags_script        . '"'
 
 function! HiTagsUpdate()
 	let pid = system(s:generation_command)