o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Russ Cox 2007-08-22 09:00:26 -04:00
commit ebda53e16b
6 changed files with 101 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
man/man1/dict.1
View file

@ -146,6 +146,12 @@ the default command is
.BR p . .BR p .
Otherwise, the default command is the previous command. Otherwise, the default command is the previous command.
.PP .PP
.I Dict
searches for dictionaries in the directory named by
.B $dictpath
(default
.BR \*9/dict ).
.PP
.I Adict .I Adict
is a dictionary browser for is a dictionary browser for
.IR acme (1). .IR acme (1).

4
src/cmd/9pfuse/fuse.c
View file

@ -803,7 +803,9 @@ mountfuse(char *mtpt)
if(access(f="/System/Library/Extensions/fusefs.kext" if(access(f="/System/Library/Extensions/fusefs.kext"
"/Contents/Resources/load_fusefs", 0) < 0 && "/Contents/Resources/load_fusefs", 0) < 0 &&
access(f="/Library/Extensions/fusefs.kext" access(f="/Library/Extensions/fusefs.kext"
"/Contents/Resources/load_fusefs", 0) < 0){ "/Contents/Resources/load_fusefs", 0) < 0 &&
access(f="/System/Library/Filesystems"
"/fusefs.fs/Support/load_fusefs", 0) < 0){
werrstr("cannot find load_fusefs"); werrstr("cannot find load_fusefs");
return -1; return -1;
} }

29
src/cmd/dict/dict.c
View file

@ -68,7 +68,7 @@ main(int argc, char **argv)
dict = 0; dict = 0;
for(i=0; dicts[i].name; i++){ for(i=0; dicts[i].name; i++){
if(access(unsharp(dicts[i].path), 0)>=0 && access(unsharp(dicts[i].indexpath), 0)>=0){ if(access(dictfile(dicts[i].path), 0)>=0 && access(dictfile(dicts[i].indexpath), 0)>=0){
dict = &dicts[i]; dict = &dicts[i];
break; break;
} }
@ -119,8 +119,8 @@ main(int argc, char **argv)
line = malloc(strlen(p)+5); line = malloc(strlen(p)+5);
sprint(line, "/%s/P\n", p); sprint(line, "/%s/P\n", p);
} }
dict->path = unsharp(dict->path); dict->path = dictfile(dict->path);
dict->indexpath = unsharp(dict->indexpath); dict->indexpath = dictfile(dict->indexpath);
bdict = Bopen(dict->path, OREAD); bdict = Bopen(dict->path, OREAD);
if(!bdict) { if(!bdict) {
err("can't open dictionary %s", dict->path); err("can't open dictionary %s", dict->path);
@ -171,7 +171,7 @@ usage(void)
Bprint(bout, "dictionaries (brackets mark dictionaries not present on this system):\n"); Bprint(bout, "dictionaries (brackets mark dictionaries not present on this system):\n");
for(i = 0; dicts[i].name; i++){ for(i = 0; dicts[i].name; i++){
a = b = ""; a = b = "";
if(access(unsharp(dicts[i].path), 0)<0 || access(unsharp(dicts[i].indexpath), 0)<0){ if(access(dictfile(dicts[i].path), 0)<0 || access(dictfile(dicts[i].indexpath), 0)<0){
a = "["; a = "[";
b = "]"; b = "]";
} }
@ -675,3 +675,24 @@ setdotprev(void)
dot->n = 1; dot->n = 1;
dot->cur = 0; dot->cur = 0;
} }
/*
* find the specified file and return a path.
* default location is #9/dict, but can be
* in $dictdir instead.
*/
char*
dictfile(char *f)
{
static char *dict;
static int did;
if(!did){
dict = getenv("dictpath");
did = 1;
}
if(dict)
return smprint("%s/%s", dict, f);
return unsharp(smprint("#9/dict/%s", f));
}

1
src/cmd/dict/dict.h
View file

@ -115,6 +115,7 @@ void outnl(int);
void outpiece(char *, char *); void outpiece(char *, char *);
void runescpy(Rune*, Rune*); void runescpy(Rune*, Rune*);
long runetol(Rune*); long runetol(Rune*);
char *dictfile(char*);
long oednextoff(long); long oednextoff(long);
void oedprintentry(Entry, int); void oedprintentry(Entry, int);

10
src/cmd/dict/robert.c
View file

@ -84,10 +84,10 @@ initsubtab(void)
#define GSHORT(p) (((p)[0]<<8) | (p)[1]) #define GSHORT(p) (((p)[0]<<8) | (p)[1])
#define GLONG(p) (((p)[0]<<24) | ((p)[1]<<16) | ((p)[2]<<8) | (p)[3]) #define GLONG(p) (((p)[0]<<24) | ((p)[1]<<16) | ((p)[2]<<8) | (p)[3])
static char cfile[] = "#9/dict/robert/cits.rob"; static char cfile[] = "robert/cits.rob";
static char dfile[] = "#9/dict/robert/defs.rob"; static char dfile[] = "robert/defs.rob";
static char efile[] = "#9/dict/robert/etym.rob"; static char efile[] = "robert/etym.rob";
static char kfile[] = "#9/dict/robert/_phon"; static char kfile[] = "robert/_phon";
static Biobuf * cb; static Biobuf * cb;
static Biobuf * db; static Biobuf * db;
@ -316,7 +316,7 @@ Bouvrir(char *fichier)
{ {
Biobuf *db; Biobuf *db;
fichier = unsharp(fichier); fichier = dictfile(fichier);
db = Bopen(fichier, OREAD); db = Bopen(fichier, OREAD);
if(db == 0){ if(db == 0){
fprint(2, "%s: impossible d'ouvrir %s: %r\n", argv0, fichier); fprint(2, "%s: impossible d'ouvrir %s: %r\n", argv0, fichier);

122
src/cmd/dict/utils.c
View file

@ -5,163 +5,163 @@
Dict dicts[] = { Dict dicts[] = {
{"oed", "Oxford English Dictionary, 2nd Ed.", {"oed", "Oxford English Dictionary, 2nd Ed.",
"#9/dict/oed2", "#9/dict/oed2index", "oed2", "oed2index",
oednextoff, oedprintentry, oedprintkey}, oednextoff, oedprintentry, oedprintkey},
{"ahd", "American Heritage Dictionary, 2nd College Ed.", {"ahd", "American Heritage Dictionary, 2nd College Ed.",
"#9/dict/ahd/DICT.DB", "#9/dict/ahd/index", "ahd/DICT.DB", "ahd/index",
ahdnextoff, ahdprintentry, ahdprintkey}, ahdnextoff, ahdprintentry, ahdprintkey},
{"pgw", "Project Gutenberg Webster Dictionary", {"pgw", "Project Gutenberg Webster Dictionary",
"#9/dict/pgw", "#9/dict/pgwindex", "pgw", "pgwindex",
pgwnextoff, pgwprintentry, pgwprintkey}, pgwnextoff, pgwprintentry, pgwprintkey},
{"thesaurus", "Collins Thesaurus", {"thesaurus", "Collins Thesaurus",
"#9/dict/thesaurus", "#9/dict/thesindex", "thesaurus", "thesindex",
thesnextoff, thesprintentry, thesprintkey}, thesnextoff, thesprintentry, thesprintkey},
{"roget", "Project Gutenberg Roget's Thesaurus", {"roget", "Project Gutenberg Roget's Thesaurus",
"#9/dict/roget", "#9/dict/rogetindex", "roget", "rogetindex",
rogetnextoff, rogetprintentry, rogetprintkey}, rogetnextoff, rogetprintentry, rogetprintkey},
{"ce", "Gendai Chinese->English", {"ce", "Gendai Chinese->English",
"#9/dict/world/sansdata/sandic24.dat", "world/sansdata/sandic24.dat",
"#9/dict/world/sansdata/ceindex", "world/sansdata/ceindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"ceh", "Gendai Chinese->English (Hanzi index)", {"ceh", "Gendai Chinese->English (Hanzi index)",
"#9/dict/world/sansdata/sandic24.dat", "world/sansdata/sandic24.dat",
"#9/dict/world/sansdata/cehindex", "world/sansdata/cehindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"ec", "Gendai English->Chinese", {"ec", "Gendai English->Chinese",
"#9/dict/world/sansdata/sandic24.dat", "world/sansdata/sandic24.dat",
"#9/dict/world/sansdata/ecindex", "world/sansdata/ecindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"dae", "Gyldendal Danish->English", {"dae", "Gyldendal Danish->English",
"#9/dict/world/gylddata/sandic30.dat", "world/gylddata/sandic30.dat",
"#9/dict/world/gylddata/daeindex", "world/gylddata/daeindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"eda", "Gyldendal English->Danish", {"eda", "Gyldendal English->Danish",
"#9/dict/world/gylddata/sandic29.dat", "world/gylddata/sandic29.dat",
"#9/dict/world/gylddata/edaindex", "world/gylddata/edaindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"due", "Wolters-Noordhoff Dutch->English", {"due", "Wolters-Noordhoff Dutch->English",
"#9/dict/world/woltdata/sandic07.dat", "world/woltdata/sandic07.dat",
"#9/dict/world/woltdata/deindex", "world/woltdata/deindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"edu", "Wolters-Noordhoff English->Dutch", {"edu", "Wolters-Noordhoff English->Dutch",
"#9/dict/world/woltdata/sandic06.dat", "world/woltdata/sandic06.dat",
"#9/dict/world/woltdata/edindex", "world/woltdata/edindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"fie", "WSOY Finnish->English", {"fie", "WSOY Finnish->English",
"#9/dict/world/werndata/sandic32.dat", "world/werndata/sandic32.dat",
"#9/dict/world/werndata/fieindex", "world/werndata/fieindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"efi", "WSOY English->Finnish", {"efi", "WSOY English->Finnish",
"#9/dict/world/werndata/sandic31.dat", "world/werndata/sandic31.dat",
"#9/dict/world/werndata/efiindex", "world/werndata/efiindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"fe", "Collins French->English", {"fe", "Collins French->English",
"#9/dict/fe", "#9/dict/feindex", "fe", "feindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"ef", "Collins English->French", {"ef", "Collins English->French",
"#9/dict/ef", "#9/dict/efindex", "ef", "efindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"ge", "Collins German->English", {"ge", "Collins German->English",
"#9/dict/ge", "#9/dict/geindex", "ge", "geindex",
pcollgnextoff, pcollgprintentry, pcollgprintkey}, pcollgnextoff, pcollgprintentry, pcollgprintkey},
{"eg", "Collins English->German", {"eg", "Collins English->German",
"#9/dict/eg", "#9/dict/egindex", "eg", "egindex",
pcollgnextoff, pcollgprintentry, pcollgprintkey}, pcollgnextoff, pcollgprintentry, pcollgprintkey},
{"ie", "Collins Italian->English", {"ie", "Collins Italian->English",
"#9/dict/ie", "#9/dict/ieindex", "ie", "ieindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"ei", "Collins English->Italian", {"ei", "Collins English->Italian",
"#9/dict/ei", "#9/dict/eiindex", "ei", "eiindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"je", "Sanshusha Japanese->English", {"je", "Sanshusha Japanese->English",
"#9/dict/world/sansdata/sandic18.dat", "world/sansdata/sandic18.dat",
"#9/dict/world/sansdata/jeindex", "world/sansdata/jeindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"jek", "Sanshusha Japanese->English (Kanji index)", {"jek", "Sanshusha Japanese->English (Kanji index)",
"#9/dict/world/sansdata/sandic18.dat", "world/sansdata/sandic18.dat",
"#9/dict/world/sansdata/jekindex", "world/sansdata/jekindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"ej", "Sanshusha English->Japanese", {"ej", "Sanshusha English->Japanese",
"#9/dict/world/sansdata/sandic18.dat", "world/sansdata/sandic18.dat",
"#9/dict/world/sansdata/ejindex", "world/sansdata/ejindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"tjeg", "Sanshusha technical Japanese->English,German", {"tjeg", "Sanshusha technical Japanese->English,German",
"#9/dict/world/sansdata/sandic16.dat", "world/sansdata/sandic16.dat",
"#9/dict/world/sansdata/tjegindex", "world/sansdata/tjegindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"tjegk", "Sanshusha technical Japanese->English,German (Kanji index)", {"tjegk", "Sanshusha technical Japanese->English,German (Kanji index)",
"#9/dict/world/sansdata/sandic16.dat", "world/sansdata/sandic16.dat",
"#9/dict/world/sansdata/tjegkindex", "world/sansdata/tjegkindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"tegj", "Sanshusha technical English->German,Japanese", {"tegj", "Sanshusha technical English->German,Japanese",
"#9/dict/world/sansdata/sandic16.dat", "world/sansdata/sandic16.dat",
"#9/dict/world/sansdata/tegjindex", "world/sansdata/tegjindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"tgje", "Sanshusha technical German->Japanese,English", {"tgje", "Sanshusha technical German->Japanese,English",
"#9/dict/world/sansdata/sandic16.dat", "world/sansdata/sandic16.dat",
"#9/dict/world/sansdata/tgjeindex", "world/sansdata/tgjeindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"ne", "Kunnskapforlaget Norwegian->English", {"ne", "Kunnskapforlaget Norwegian->English",
"#9/dict/world/kunndata/sandic28.dat", "world/kunndata/sandic28.dat",
"#9/dict/world/kunndata/neindex", "world/kunndata/neindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"en", "Kunnskapforlaget English->Norwegian", {"en", "Kunnskapforlaget English->Norwegian",
"#9/dict/world/kunndata/sandic27.dat", "world/kunndata/sandic27.dat",
"#9/dict/world/kunndata/enindex", "world/kunndata/enindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"re", "Leon Ungier Russian->English", {"re", "Leon Ungier Russian->English",
"#9/dict/re", "#9/dict/reindex", "re", "reindex",
simplenextoff, simpleprintentry, simpleprintkey}, simplenextoff, simpleprintentry, simpleprintkey},
{"er", "Leon Ungier English->Russian", {"er", "Leon Ungier English->Russian",
"#9/dict/re", "#9/dict/erindex", "re", "erindex",
simplenextoff, simpleprintentry, simpleprintkey}, simplenextoff, simpleprintentry, simpleprintkey},
{"se", "Collins Spanish->English", {"se", "Collins Spanish->English",
"#9/dict/se", "#9/dict/seindex", "se", "seindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"es", "Collins English->Spanish", {"es", "Collins English->Spanish",
"#9/dict/es", "#9/dict/esindex", "es", "esindex",
pcollnextoff, pcollprintentry, pcollprintkey}, pcollnextoff, pcollprintentry, pcollprintkey},
{"swe", "Esselte Studium Swedish->English", {"swe", "Esselte Studium Swedish->English",
"#9/dict/world/essedata/sandic34.dat", "world/essedata/sandic34.dat",
"#9/dict/world/essedata/sweindex", "world/essedata/sweindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"esw", "Esselte Studium English->Swedish", {"esw", "Esselte Studium English->Swedish",
"#9/dict/world/essedata/sandic33.dat", "world/essedata/sandic33.dat",
"#9/dict/world/essedata/eswindex", "world/essedata/eswindex",
worldnextoff, worldprintentry, worldprintkey}, worldnextoff, worldprintentry, worldprintkey},
{"movie", "Movies -- by title", {"movie", "Movies -- by title",
"movie/data", "#9/dict/movtindex", "movie/data", "movtindex",
movienextoff, movieprintentry, movieprintkey}, movienextoff, movieprintentry, movieprintkey},
{"moviea", "Movies -- by actor", {"moviea", "Movies -- by actor",
"movie/data", "#9/dict/movaindex", "movie/data", "movaindex",
movienextoff, movieprintentry, movieprintkey}, movienextoff, movieprintentry, movieprintkey},
{"movied", "Movies -- by director", {"movied", "Movies -- by director",
"movie/data", "#9/dict/movdindex", "movie/data", "movdindex",
movienextoff, movieprintentry, movieprintkey}, movienextoff, movieprintentry, movieprintkey},
{"slang", "English Slang", {"slang", "English Slang",
"#9/dict/slang", "#9/dict/slangindex", "slang", "slangindex",
slangnextoff, slangprintentry, slangprintkey}, slangnextoff, slangprintentry, slangprintkey},
{"robert", "Robert Électronique", {"robert", "Robert Électronique",
"#9/dict/robert/_pointers", "#9/dict/robert/_index", "robert/_pointers", "robert/_index",
robertnextoff, robertindexentry, robertprintkey}, robertnextoff, robertindexentry, robertprintkey},
{"robertv", "Robert Électronique - formes des verbes", {"robertv", "Robert Électronique - formes des verbes",
"#9/dict/robert/flex.rob", "#9/dict/robert/_flexindex", "robert/flex.rob", "robert/_flexindex",
robertnextflex, robertflexentry, robertprintkey}, robertnextflex, robertflexentry, robertprintkey},
{0, 0, 0, 0, 0} {0, 0, 0, 0, 0}