Changeset 414a272


Ignore:
Timestamp:
May 25, 2011, 11:10:41 PM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
697221f (diff), 6476c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge 6476c0e00a11e070e7480afa291a8a0976aa7828 into 697221fc51f0060043c93821f0358317f6bc6ab0
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.c

    rf97c1a6 r6476c0e  
    464464  }
    465465  bread = read(rfd, buf, navail);
    466   if (buf[navail-1] != '\0') {
    467     buf[navail] = '\0';
    468   }
    469 
    470   err = g_strdup_printf("[stderr]\n%s", buf);
     466  if (bread == -1)
     467    return;
     468
     469  err = g_strdup_printf("[stderr]\n%.*s", bread, buf);
    471470
    472471  owl_function_log_err(err);
Note: See TracChangeset for help on using the changeset viewer.