external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Make dtinfo work on OpenBSD.

Browse source 
strstream.h is now called "strstream" and is obsolete, but use it anyway until
all code is converted over.  This also needs std:: added, at least for GCC
4.2.1.  Lastly, when hardcoding the path to perl, /usr/bin/perl should be used
rather than anything else.
This commit is contained in:
Pascal Stumpf 2012-08-11 13:43:57 +02:00 committed by Jon Trulson
parent 3e4517dc2a
commit a8d5c1f0ba
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cde/programs/dtinfo/tools/misc/msgsets.C
View file

@ -42,7 +42,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <stdlib.h> #include <stdlib.h>
#if !defined(__DECCXX) && !defined(USL) #if !defined(__DECCXX) && !defined(USL) && !defined(CSRG_BASED)
#include <osfcn.h> #include <osfcn.h>
#else #else
#include <unistd.h> #include <unistd.h>
@ -195,11 +195,12 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
/* All Rights Reserved */ /* All Rights Reserved */
#include <string.h> #include <string.h>
#include <strstream.h> #include <strstream>
#include <iostream>
#define BUFFER_INCR_UNIT 64 #define BUFFER_INCR_UNIT 64
ostrstream **sets; std::ostrstream **sets;
int sets_cnt = 0; /* number of sets slots occupied */ int sets_cnt = 0; /* number of sets slots occupied */
int sets_max = 0; /* total number of sets slots */ int sets_max = 0; /* total number of sets slots */
@ -509,14 +510,14 @@ case 1:
sets_max += BUFFER_INCR_UNIT; sets_max += BUFFER_INCR_UNIT;
if (sets_cnt == 0) { if (sets_cnt == 0) {
sets = (ostrstream **) sets = (std::ostrstream **)
malloc(sizeof(ostrstream *) * sets_max); malloc(sizeof(std::ostrstream *) * sets_max);
set_nums = (int *) set_nums = (int *)
malloc(sizeof(int) * sets_max); malloc(sizeof(int) * sets_max);
} }
else { else {
sets = (ostrstream **) sets = (std::ostrstream **)
realloc(sets, sizeof(ostrstream *) * sets_max); realloc(sets, sizeof(std::ostrstream *) * sets_max);
set_nums = (int *) set_nums = (int *)
realloc(set_nums, sizeof(int) * sets_max); realloc(set_nums, sizeof(int) * sets_max);
} }
@ -528,7 +529,7 @@ case 1:
} }
if (cur_set >= 0) if (cur_set >= 0)
*sets[cur_set] << '\0'; *sets[cur_set] << '\0';
sets[cur_set = sets_cnt++] = new ostrstream; sets[cur_set = sets_cnt++] = new std::ostrstream;
*sets[cur_set] << (char*)yytext; *sets[cur_set] << (char*)yytext;
@ -556,7 +557,7 @@ case 3:
case 4: case 4:
{ {
if (cur_set < 0) { // maybe not a message id if (cur_set < 0) { // maybe not a message id
cout << (char*)yytext; std::cout << (char*)yytext;
} }
else { // must be a message id else { // must be a message id
*sets[cur_set] << (char*)yytext; *sets[cur_set] << (char*)yytext;
@ -581,7 +582,7 @@ case 7:
case 8: case 8:
{ {
if (cur_set < 0) if (cur_set < 0)
cout << *(char*)yytext; std::cout << *(char*)yytext;
else else
*sets[cur_set] << *(char*)yytext; *sets[cur_set] << *(char*)yytext;
} }
@ -1151,7 +1152,7 @@ main()
for (i = 0; i < sets_cnt; i++) { for (i = 0; i < sets_cnt; i++) {
const char* record = sets[sorted[i]]->str(); const char* record = sets[sorted[i]]->str();
cout << record << '\n' << flush; std::cout << record << '\n' << std::flush;
} }
free(sorted); free(sorted);

2
cde/programs/dtinfo/tools/misc/treeres
View file

@ -1,5 +1,5 @@
# feed this into perl # feed this into perl
eval '(exit $?0)' && eval 'exec /usr/local/bin/perl $0 ${1+"$@"}' & eval 'exec /usr/local/bin/perl $0 $argv' eval '(exit $?0)' && eval 'exec /usr/bin/perl $0 ${1+"$@"}' & eval 'exec /usr/bin/perl $0 $argv'
if 0; if 0;
# treeres - resource file preprocessor # treeres - resource file preprocessor