Attachment #38612 for bug #62427

View | Details | Raw Unified | Return to bug 62427
Collapse All | Expand All

Lines 9-18 Link Here

(-)ttmkfdir-3.0.9/directory.cpp (-1 / +4 lines)
9	{	9	{
10	}	10	}
11		11
12	void	12	int
13	directory::scan (const std::string &dir)	13	directory::scan (const std::string &dir)
14	{	14	{
15	DIR *ttfdir = opendir(dir.c_str ());	15	DIR *ttfdir = opendir(dir.c_str ());
		16	if(!ttfdir)
		17	return -1;
16		18
17	this->clear ();	19	this->clear ();
18	dirpath = dir;	20	dirpath = dir;
Lines 26-31 Link Here
26	}	28	}
27		29
28	closedir (ttfdir);	30	closedir (ttfdir);
		31	return 0;
29	}	32	}
30		33
31	bool	34	bool

Lines 11-17 Link Here

(-)ttmkfdir-3.0.9/directory.h (-1 / +1 lines)
11	if (path != "") scan (path);	11	if (path != "") scan (path);
12	};	12	};
13	virtual ~directory (void);	13	virtual ~directory (void);
14	void scan (const std::string &path = ".");	14	int scan (const std::string &path = ".");
15	virtual bool select (const char *name) const;	15	virtual bool select (const char *name) const;
16	const std::string &path (void) const {	16	const std::string &path (void) const {
17	return dirpath;	17	return dirpath;

Lines 98-107 Link Here

(-)ttmkfdir-3.0.9/encoding.l (-2 / +2 lines)
98	char *startptr = strip_first (yytext);	98	char *startptr = strip_first (yytext);
99	char *endptr;	99	char *endptr;
100		100
101	int i1 = std::strtol (startptr, &endptr, 0);	101	int i1 = std::strtol (startptr, &endptr, 10);
102	startptr = endptr;	102	startptr = endptr;
103		103
104	int i2 = std::strtol (startptr, &endptr, 0);	104	int i2 = std::strtol (startptr, &endptr, 10);
105		105
106	if (startptr == endptr) {	106	if (startptr == endptr) {
107	i2 = i1;	107	i2 = i1;

Lines 60-66 Link Here

(-)ttmkfdir-3.0.9/ttmkfdir.cpp (-1 / +4 lines)
60	return 0;	60	return 0;
61	}	61	}
62		62
63	dir::instance()->scan (cmdline::instance()->option ("font-dir"));	63	if(dir::instance()->scan (cmdline::instance()->option ("font-dir")) == -1) {
		64	printf("No such directory...\n");
		65	return -1;
		66	}
64		67
65	for (directory::iterator i = dir::instance()->begin (); i != dir::instance()->end(); i++) {	68	for (directory::iterator i = dir::instance()->begin (); i != dir::instance()->end(); i++) {
66	const ttf::Face face (dir::instance()->path() + '/' + *i);	69	const ttf::Face face (dir::instance()->path() + '/' + *i);

Return to bug 62427