Skip to content

Commit

Permalink
Merge branch 'master' of github.com:brainstorm/facs
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Valls Guimera committed Jul 27, 2014
2 parents 43605ca + a79ec85 commit 15ae75a
Show file tree
Hide file tree
Showing 3 changed files with 3,767 additions and 15,206 deletions.
1 change: 1 addition & 0 deletions facs/query.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ void read_process (bloom * bl, Queue * info, Queue * tail, F_set * File_head, fl
int result = 0;
next_job = check_fmt (info, tail, start_point, fmt_type);
// make sure it can handle DOS and Unix format ('\r\n' and '\n')
// XXX: what about OSX sinle '\n' ('a0' in hexa)?
if (next_job == NULL)
return;
while (start_point != next_job)
Expand Down
2 changes: 1 addition & 1 deletion facs/tool.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ char *check_fmt (Queue *info, Queue *tail, char *start_point, char type)
next_job = info->next->location;
}
else
{
{ // XXX: Does this account for OSX-style newlines? next_job is always NULL on OSX fastq files.
next_job = strchr (start_point, '\0');
if (next_job[-1] == '\n' && next_job[-2] == '\n')
next_job -= 1;
Expand Down
Loading

0 comments on commit 15ae75a

Please sign in to comment.