← Back to branch summary

~darkxst/ubuntu/raring/xorg-server/lp1073724

« back to all changes in this revision

Viewing changes to hw/xfree86/common/xf86Xinput.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2011-12-20 11:39:51 UTC
  • mto: (0.10.23) (1.1.48)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: package-import@ubuntu.com-20111220113951-cx9svdcnqpcta5wk
Tags: upstream-1.11.99.2
Import upstream version 1.11.99.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/common/xf86Xinput.c
460
460
 
461
461
    if (*host_os == '\0') {
462
462
        if (uname(&name) >= 0)
463
 
            strcpy(host_os, name.sysname);
 
463
            strlcpy(host_os, name.sysname, sizeof(host_os));
464
464
        else {
465
 
            strncpy(host_os, "unknown", sizeof(host_os));
466
 
            host_os[sizeof(host_os)-1] = '\0';
 
465
            strlcpy(host_os, "unknown", sizeof(host_os));
467
466
        }
468
467
    }
469
468
    return host_os;