Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compilation on Linux with some minor changes.

Browse source
This commit is contained in:
Siteshwar Vashisht 2012-02-28 21:20:09 +05:30
parent cf54ad8242
commit 392232246e
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin_jobs.cpp
View file

@ -43,7 +43,7 @@ enum
/** /**
Calculates the cpu usage (in percent) of the specified job. Calculates the cpu usage (in percent) of the specified job.
*/ */
static int cpu_use( job_t *j ) static int cpu_use( const job_t *j )
{ {
double u=0; double u=0;
process_t *p; process_t *p;

8
common.cpp
View file

@ -555,7 +555,13 @@ wchar_t *quote_end( const wchar_t *pos )
wcstring wsetlocale(int category, const wchar_t *locale) wcstring wsetlocale(int category, const wchar_t *locale)
{ {
char *lang = locale?wcs2str( locale ):0; char *lang = NULL;
if (locale && wcscmp(locale,L"")){
lang = wcs2str( locale );
}
{
lang = NULL;
}
char * res = setlocale(category,lang); char * res = setlocale(category,lang);
free( lang ); free( lang );

5
parser.cpp
View file

@ -18,6 +18,7 @@ The fish parser. Contains functions for parsing and evaluating code.
#include <pwd.h> #include <pwd.h>
#include <dirent.h> #include <dirent.h>
#include <signal.h> #include <signal.h>
#include <algorithm>
#include "fallback.h" #include "fallback.h"
#include "util.h" #include "util.h"
@ -1244,7 +1245,7 @@ bool parser_t::job_remove( job_t *j )
void parser_t::job_promote(job_t *job) void parser_t::job_promote(job_t *job)
{ {
job_list_t::iterator loc = find(my_job_list.begin(), my_job_list.end(), job); job_list_t::iterator loc = std::find(my_job_list.begin(), my_job_list.end(), job);
assert(loc != my_job_list.end()); assert(loc != my_job_list.end());
/* Move the job to the beginning */ /* Move the job to the beginning */
@ -2308,7 +2309,7 @@ void parser_t::eval_job( tokenizer *tok )
if( job_start_pos < tok_get_pos( tok ) ) if( job_start_pos < tok_get_pos( tok ) )
{ {
int stop_pos = tok_get_pos( tok ); int stop_pos = tok_get_pos( tok );
wchar_t *newline = wcschr( tok_string(tok)+start_pos, const wchar_t *newline = wcschr( tok_string(tok)+start_pos,
L'\n' ); L'\n' );
if( newline ) if( newline )
stop_pos = mini( stop_pos, newline - tok_string(tok) ); stop_pos = mini( stop_pos, newline - tok_string(tok) );