sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-11-04 00:52:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #150 from ttohin/feature/osx-build

Browse Source 
Fix osx build
This commit is contained in:
Filippo Scognamiglio
2014-10-09 22:20:44 +02:00
parent 9bd0ca74b6 a78231eac5
commit 1cbedb41d9
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -42,3 +42,8 @@ Makefile*
# Excludes compiled files # Excludes compiled files
imports imports
cool-retro-term cool-retro-term
# Mac OSX
.DS_Store
*.app

5
konsole-qml-plugin/konsole-qml-plugin.pro
View File

@@ -6,7 +6,10 @@ TEMPLATE = lib
CONFIG += qt plugin hide_symbols CONFIG += qt plugin hide_symbols
QT += qml quick widgets QT += qml quick widgets
DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H
!macx:DEFINES += HAVE_UPDWTMPX
macx:DEFINES += HAVE_UTMPX HAVE_UT_USER
#MANUALY DEFINED PLATFORM #MANUALY DEFINED PLATFORM
DEFINES += Q_WS_UBUNTU DEFINES += Q_WS_UBUNTU

10
konsole-qml-plugin/src/kpty.cpp
View File

@@ -506,7 +506,11 @@ void KPty::login(const char * user, const char * remotehost)
// note: strncpy without terminators _is_ correct here. man 4 utmp // note: strncpy without terminators _is_ correct here. man 4 utmp
if (user) { if (user) {
# ifdef HAVE_UT_USER
strncpy(l_struct.ut_user, user, sizeof(l_struct.ut_user));
#elif
strncpy(l_struct.ut_name, user, sizeof(l_struct.ut_name)); strncpy(l_struct.ut_name, user, sizeof(l_struct.ut_name));
#endif
} }
if (remotehost) { if (remotehost) {
@@ -617,7 +621,13 @@ void KPty::logout()
setutent(); setutent();
if ((ut = getutline(&l_struct))) { if ((ut = getutline(&l_struct))) {
# endif # endif
# ifdef HAVE_UT_USER
memset(ut->ut_user, 0, sizeof(*ut->ut_user));
#elif
memset(ut->ut_name, 0, sizeof(*ut->ut_name)); memset(ut->ut_name, 0, sizeof(*ut->ut_name));
#endif
memset(ut->ut_host, 0, sizeof(*ut->ut_host)); memset(ut->ut_host, 0, sizeof(*ut->ut_host));
# ifdef HAVE_STRUCT_UTMP_UT_SYSLEN # ifdef HAVE_STRUCT_UTMP_UT_SYSLEN
ut->ut_syslen = 0; ut->ut_syslen = 0;