hrev49571 adds 2 changesets to branch 'master'
old head: 462bfeede0cd123afe2e79d465876289e925ca53
new head: 8074f0b94b25c8a255b4c5bdb579bd0e5d8c09f8
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=8074f0b94b25+%5E462bfeede0cd
----------------------------------------------------------------------------
71cc01b2b1a5: registrar: Use the safer strlcpy instead of strcpy.
8074f0b94b25: launch_daemon: Replace the remaining putenv() calls by setenv().
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 6 deletions(-)
src/servers/launch/LaunchDaemon.cpp | 7 ++-----
src/servers/registrar/mime/RegistrarThread.cpp | 2 +-
############################################################################
Commit: 71cc01b2b1a50fd241c28eae673783412067a7e2
URL: http://cgit.haiku-os.org/haiku/commit/?id=71cc01b2b1a5
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sun Aug 23 10:35:25 2015 UTC
registrar: Use the safer strlcpy instead of strcpy.
----------------------------------------------------------------------------
diff --git a/src/servers/registrar/mime/RegistrarThread.cpp
b/src/servers/registrar/mime/RegistrarThread.cpp
index 2ce9af6..b97d5bf 100644
--- a/src/servers/registrar/mime/RegistrarThread.cpp
+++ b/src/servers/registrar/mime/RegistrarThread.cpp
@@ -41,7 +41,7 @@ RegistrarThread::RegistrarThread(const char *name, int32
priority,
fName[0] = 0;
status_t err = name && fManagerMessenger.IsValid() ? B_OK : B_BAD_VALUE;
if (err == B_OK)
- strcpy(fName, name);
+ strlcpy(fName, name, sizeof(fName));
fStatus = err;
}
############################################################################
Revision: hrev49571
Commit: 8074f0b94b25c8a255b4c5bdb579bd0e5d8c09f8
URL: http://cgit.haiku-os.org/haiku/commit/?id=8074f0b94b25
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sun Aug 23 10:36:12 2015 UTC
launch_daemon: Replace the remaining putenv() calls by setenv().
----------------------------------------------------------------------------
diff --git a/src/servers/launch/LaunchDaemon.cpp
b/src/servers/launch/LaunchDaemon.cpp
index ef1f295..b64d40a 100644
--- a/src/servers/launch/LaunchDaemon.cpp
+++ b/src/servers/launch/LaunchDaemon.cpp
@@ -1262,13 +1262,10 @@ void
LaunchDaemon::_SetupEnvironment()
{
// Determine safemode kernel option
- BString safemode = "SAFEMODE=";
- safemode << (IsSafeMode() ? "yes" : "no");
-
- putenv(safemode.String());
+ setenv("SAFEMODE", IsSafeMode() ? "yes" : "no", true);
// Default locale settings
- putenv("LC_TYPE=en_US.UTF-8");
+ setenv("LC_TYPE", "en_US.UTF-8", true);
}
