X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/570ebe3496f2c87774d077f92fc4a1554b4b03bd..2fb476aaf6b084bdf4847db867d3d44811934c2b:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 460115d..cd2def6 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -15,14 +15,14 @@
 
 /* functions */
 void setstatus(char *str);
-char *battery();
-char *cpu_temperature();
-char *cpu_usage();
-char *datetime();
-char *ram_usage();
+char *get_battery();
+char *get_cpu_temperature();
+char *get_cpu_usage();
+char *get_datetime();
+char *get_ram_usage();
 char *smprintf(char *fmt, ...);
-char *volume();
-char *wifi_signal();
+char *get_volume();
+char *get_wifi_signal();
 
 /* global variables */
 static Display *dpy;
@@ -31,51 +31,51 @@ static Display *dpy;
 void
 setstatus(char *str)
 {
-	XStoreName(dpy, DefaultRootWindow(dpy), str);
-	XSync(dpy, False);
+    XStoreName(dpy, DefaultRootWindow(dpy), str);
+    XSync(dpy, False);
 }
 
 /* battery percentage */
 char *
-battery()
+get_battery()
 {
-	int battery_now, battery_full, battery_perc;
-	FILE *fp;
+    int battery_now, battery_full, battery_perc;
+    FILE *fp;
 
     /* open battery now file */
-	if (!(fp = fopen(batterynowfile, "r"))) {
+    if (!(fp = fopen(batterynowfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
         exit(1);
     }
 
     /* read value */
-	fscanf(fp, "%i", &battery_now);
+    fscanf(fp, "%i", &battery_now);
 
     /* close battery now file */
-	fclose(fp);
-	
+    fclose(fp);
+
     /* open battery full file */
-	if (!(fp = fopen(batteryfullfile, "r"))) {
+    if (!(fp = fopen(batteryfullfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
         exit(1);
     }
 
     /* read value */
-	fscanf(fp, "%i", &battery_full);
+    fscanf(fp, "%i", &battery_full);
 
     /* close battery full file */
-	fclose(fp);
+    fclose(fp);
 
     /* calculate percent */
-	battery_perc = battery_now / (battery_full / 100);
+    battery_perc = battery_now / (battery_full / 100);
 
     /* return batt_perc as string */
-	return smprintf("%d%%", battery_perc);
+    return smprintf("%d%%", battery_perc);
 }
 
 /* cpu temperature */
 char *
-cpu_temperature()
+get_cpu_temperature()
 {
     int temperature;
     FILE *fp;
@@ -98,14 +98,14 @@ cpu_temperature()
 
 /* cpu percentage */
 char *
-cpu_usage()
+get_cpu_usage()
 {
     int cpu_perc;
     long double a[4], b[4];
     FILE *fp;
 
     /* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
+    if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
         exit(1);
     }
@@ -120,7 +120,7 @@ cpu_usage()
     sleep(1);
 
     /* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
+    if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
         exit(1);
     }
@@ -140,33 +140,33 @@ cpu_usage()
 
 /* date and time */
 char *
-datetime()
+get_datetime()
 {
-	time_t tm;
-	size_t bufsize = 19;
-	char *buf = malloc(bufsize);
+    time_t tm;
+    size_t bufsize = 19;
+    char *buf = malloc(bufsize);
 
     /* get time in format */
-	time(&tm);
-	if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-		fprintf(stderr, "Strftime failed.\n");
-		exit(1);
-	}
+    time(&tm);
+    if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
+        fprintf(stderr, "Strftime failed.\n");
+        exit(1);
+    }
 
     /* return time */
-	return buf;
+    return buf;
 }
 
 /* ram percentage */
 char *
-ram_usage()
+get_ram_usage()
 {
     int ram_perc;
     long total, free, available;
     FILE *fp;
 
     /* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
+    if (!(fp = fopen("/proc/meminfo", "r"))) {
         fprintf(stderr, "Error opening meminfo file.");
         exit(1);
     }
@@ -190,83 +190,83 @@ ram_usage()
 char *
 smprintf(char *fmt, ...)
 {
-	va_list fmtargs;
-	char *ret;
-	int len;
+    va_list fmtargs;
+    char *ret;
+    int len;
 
-	va_start(fmtargs, fmt);
-	len = vsnprintf(NULL, 0, fmt, fmtargs);
-	va_end(fmtargs);
+    va_start(fmtargs, fmt);
+    len = vsnprintf(NULL, 0, fmt, fmtargs);
+    va_end(fmtargs);
 
-	ret = malloc(++len);
-	if (ret == NULL) {
-		fprintf(stderr, "Malloc error.");
-		exit(1);
-	}
+    ret = malloc(++len);
+    if (ret == NULL) {
+        fprintf(stderr, "Malloc error.");
+        exit(1);
+    }
 
-	va_start(fmtargs, fmt);
-	vsnprintf(ret, len, fmt, fmtargs);
-	va_end(fmtargs);
+    va_start(fmtargs, fmt);
+    vsnprintf(ret, len, fmt, fmtargs);
+    va_end(fmtargs);
 
-	return ret;
+    return ret;
 }
 
 /* alsa volume percentage */
 char *
-volume()
+get_volume()
 {
-        int mute = 0;
-        long vol = 0, max = 0, min = 0;
-        
-        /* get volume from alsa */
-        snd_mixer_t *handle;
-        snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-        snd_mixer_selem_id_t *vol_info, *mute_info;
-        snd_mixer_open(&handle, 0);
-        snd_mixer_attach(handle, soundcard);
-        snd_mixer_selem_register(handle, NULL, NULL);
-        snd_mixer_load(handle);
-        snd_mixer_selem_id_malloc(&vol_info);
-        snd_mixer_selem_id_malloc(&mute_info);
-        snd_mixer_selem_id_set_name(vol_info, channel);
-        snd_mixer_selem_id_set_name(mute_info, channel);
-        pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-        mas_mixer = snd_mixer_find_selem(handle, mute_info);
-        snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer,
-                        &min, &max);
-        snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer,
-                        SND_MIXER_SCHN_MONO, &vol);
-        snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO,
-                        &mute);
-        if (vol_info)
-                snd_mixer_selem_id_free(vol_info);
-        if (mute_info)
-                snd_mixer_selem_id_free(mute_info);
-        if (handle)
-                snd_mixer_close(handle);
-        
-        /* return the string (mute) */
-        if (!mute)
-            return "mute";
-        else
-            return smprintf("%d%%", (vol * 100) / max);
+    int mute = 0;
+    long vol = 0, max = 0, min = 0;
+
+    /* get volume from alsa */
+    snd_mixer_t *handle;
+    snd_mixer_elem_t *pcm_mixer, *mas_mixer;
+    snd_mixer_selem_id_t *vol_info, *mute_info;
+    snd_mixer_open(&handle, 0);
+    snd_mixer_attach(handle, soundcard);
+    snd_mixer_selem_register(handle, NULL, NULL);
+    snd_mixer_load(handle);
+    snd_mixer_selem_id_malloc(&vol_info);
+    snd_mixer_selem_id_malloc(&mute_info);
+    snd_mixer_selem_id_set_name(vol_info, channel);
+    snd_mixer_selem_id_set_name(mute_info, channel);
+    pcm_mixer = snd_mixer_find_selem(handle, vol_info);
+    mas_mixer = snd_mixer_find_selem(handle, mute_info);
+    snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
+    snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
+    snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
+    if (vol_info)
+        snd_mixer_selem_id_free(vol_info);
+    if (mute_info)
+        snd_mixer_selem_id_free(mute_info);
+    if (handle)
+        snd_mixer_close(handle);
+
+    /* return the string (mute) */
+    if (!mute)
+        return smprintf("mute");
+    else
+        return smprintf("%d%%", (vol * 100) / max);
 }
 
 /* wifi percentage */
 char *
-wifi_signal()
+get_wifi_signal()
 {
     int bufsize = 255;
-	int strength;
-	char buf[bufsize];
-	char *datastart;
+    int strength;
+    char buf[bufsize];
+    char *datastart;
     char path_start[16] = "/sys/class/net/";
     char path_end[11] = "/operstate";
     char path[32];
     char status[5];
-	FILE *fp;
+    char needle[sizeof wificard + 1];
+    FILE *fp;
 
     /* generate the path name */
+
+    memset(path, 0, sizeof path);
     strcat(path, path_start);
     strcat(path, wificard);
     strcat(path, path_end);
@@ -295,17 +295,18 @@ wifi_signal()
     }
 
     /* extract the signal strength */
-	fgets(buf, bufsize, fp);
-	fgets(buf, bufsize, fp);
-	fgets(buf, bufsize, fp);
-	if ((datastart = strstr(buf, "wlp3s0:")) != NULL) {
-		datastart = strstr(buf, ":");
-		sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d",
-	           &strength);
-	}
+    strcpy(needle, wificard);
+    strcat(needle, ":");
+    fgets(buf, bufsize, fp);
+    fgets(buf, bufsize, fp);
+    fgets(buf, bufsize, fp);
+    if ((datastart = strstr(buf, needle)) != NULL) {
+        datastart = strstr(buf, ":");
+        sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
+    }
 
     /* close wifi file */
-	fclose(fp);
+    fclose(fp);
 
     /* return strength in percent */
     return smprintf("%d%%", strength);
@@ -316,6 +317,13 @@ int
 main()
 {
     char status[1024];
+    char *wifi_signal = NULL;
+    char *battery = NULL;
+    char *cpu_usage = NULL;
+    char *cpu_temperature = NULL;
+    char *ram_usage = NULL;
+    char *volume = NULL;
+    char *datetime = NULL;
 
     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {
@@ -323,15 +331,34 @@ main()
         exit(1);
     }
 
-    /* return status every second */	
-	for (;;) {
-		sprintf(status, FORMATSTRING, ARGUMENTS);
-		setstatus(status);
-	}
+    /* return status every second */
+    for (;;) {
+        /* assign the values */
+        wifi_signal = get_wifi_signal();
+        battery = get_battery();
+        cpu_usage = get_cpu_usage();
+        cpu_temperature = get_cpu_temperature();
+        ram_usage = get_ram_usage();
+        volume = get_volume();
+        datetime = get_datetime();
+
+        /* return the status */
+        sprintf(status, FORMATSTRING, ARGUMENTS);
+        setstatus(status);
+
+        /* free the values */
+        free(wifi_signal);
+        free(battery);
+        free(cpu_usage);
+        free(cpu_temperature);
+        free(ram_usage);
+        free(volume);
+        free(datetime);
+    }
 
     /* close display */
     XCloseDisplay(dpy);
 
     /* exit successfully */
-	return 0;
+    return 0;
 }